Author: jmorliaguet
Date: Tue Mar 14 09:44:49 2006
New Revision: 2639
Modified:
cpsskins/branches/jmo-perspectives/ui/framework/cpsskins.js
cpsskins/branches/jmo-perspectives/ui/framework/tests/unit/cpsskins_test.html
Log:
- removed unused methods
Modified: cpsskins/branches/jmo-perspectives/ui/framework/cpsskins.js
==============================================================================
--- cpsskins/branches/jmo-perspectives/ui/framework/cpsskins.js (original)
+++ cpsskins/branches/jmo-perspectives/ui/framework/cpsskins.js Tue Mar 14
09:44:49 2006
@@ -879,61 +879,19 @@
return false;
},
- getOrder: function(node) {
- node = $(node);
- var order = 0;
- var nodes = node.parentNode.childNodes;
- for (var i=0;i<nodes.length;i++) {
- var n = nodes[i];
- if (n == node) return order;
- if (this.isIdentifiable(n)) { order += 1; }
- }
- return order;
- },
-
- getNext: function(node) {
- node = $(node);
- while (node) {
- node = node.nextSibling;
- if (!node) return null;
- if (this.isIdentifiable(node)) { return node; }
- }
- return null;
- },
-
- getPrevious: function(node) {
+ getIdentifiable: function(node) {
node = $(node);
- while (node) {
- node = node.previousSibling;
- if (!node) return null;
- if (this.isIdentifiable(node)) { return node; }
- }
- return null;
+ if (this.isIdentifiable(node)) { return node; }
+ return this.getParent(node);
},
getParent: function(node) {
- node = $(node);
while (node) {
node = node.parentNode;
if (!node) return null;
if (this.isIdentifiable(node)) { return node; }
}
return null;
- },
-
- getIdentifiable: function(node) {
- node = $(node);
- if (this.isIdentifiable(node)) { return node; }
- return this.getParent(node);
- },
-
- isEmpty: function(node) {
- node = $(node);
- var nodes = node.getElementsByTagName("*");
- for (var i=0;i<nodes.length;i++) {
- if (this.isIdentifiable(nodes[i])) { return false; }
- }
- return true;
}
});
Modified:
cpsskins/branches/jmo-perspectives/ui/framework/tests/unit/cpsskins_test.html
==============================================================================
---
cpsskins/branches/jmo-perspectives/ui/framework/tests/unit/cpsskins_test.html
(original)
+++
cpsskins/branches/jmo-perspectives/ui/framework/tests/unit/cpsskins_test.html
Tue Mar 14 09:44:49 2006
@@ -318,58 +318,12 @@
assertEqual(false, CPSSkins.Identifiable.isIdentifiable(e1.parentNode));
}},
- testGetOrder: function() { with(this) {
- assertEqual(0, CPSSkins.Identifiable.getOrder(e1));
- assertEqual(0, CPSSkins.Identifiable.getOrder(e2));
- assertEqual(1, CPSSkins.Identifiable.getOrder(e3));
- assertEqual(2, CPSSkins.Identifiable.getOrder(e4));
- assertEqual(0, CPSSkins.Identifiable.getOrder(e5));
- assertEqual(1, CPSSkins.Identifiable.getOrder(e6));
- }},
-
- testGetNext: function() { with(this) {
- assertEqual(e6, CPSSkins.Identifiable.getNext(e1));
- assertEqual(e3, CPSSkins.Identifiable.getNext(e2));
- assertEqual(e4, CPSSkins.Identifiable.getNext(e3));
- assertEqual(null, CPSSkins.Identifiable.getNext(e4));
- assertEqual(null, CPSSkins.Identifiable.getNext(e5));
- assertEqual(null, CPSSkins.Identifiable.getNext(e6));
- }},
-
- testGetPrevious: function() { with(this) {
- assertEqual(e1, CPSSkins.Identifiable.getPrevious(e6));
- assertEqual(e2, CPSSkins.Identifiable.getPrevious(e3));
- assertEqual(e3, CPSSkins.Identifiable.getPrevious(e4));
- assertEqual(null, CPSSkins.Identifiable.getPrevious(e5));
- assertEqual(null, CPSSkins.Identifiable.getPrevious(e2));
- assertEqual(null, CPSSkins.Identifiable.getPrevious(e1));
- }},
-
- testGetParent: function() { with(this) {
- assertEqual(e0, CPSSkins.Identifiable.getParent(e1));
- assertEqual(e0, CPSSkins.Identifiable.getParent(e2));
- assertEqual(e0, CPSSkins.Identifiable.getParent(e3));
- assertEqual(e0, CPSSkins.Identifiable.getParent(e4));
- assertEqual(e4, CPSSkins.Identifiable.getParent(e5));
- assertEqual(e0, CPSSkins.Identifiable.getParent(e6));
- }},
-
testGetIdentifiable: function() { with(this) {
assertEqual(e1, CPSSkins.Identifiable.getIdentifiable(e1));
assertEqual(e2, CPSSkins.Identifiable.getIdentifiable(e2));
assertEqual(e0, CPSSkins.Identifiable.getIdentifiable(e1.parentNode));
}},
- testIsEmpty: function() { with(this) {
- assertEqual(false, CPSSkins.Identifiable.isEmpty(e0));
- assertEqual(true, CPSSkins.Identifiable.isEmpty(e1));
- assertEqual(true, CPSSkins.Identifiable.isEmpty(e2));
- assertEqual(true, CPSSkins.Identifiable.isEmpty(e3));
- assertEqual(false, CPSSkins.Identifiable.isEmpty(e4));
- assertEqual(true, CPSSkins.Identifiable.isEmpty(e5));
- assertEqual(true, CPSSkins.Identifiable.isEmpty(e6));
- }},
-
/* CPSSkins.Canvas */
testCreateNode: function() { with(this) {
--
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins
