Changeset 6562

Timestamp:

04/24/07 06:06:44 (1 year ago)

Author:

sam

Message:

prototype: Add Element#firstDescendant to retrieve the first non-text child node of an element. Optimize DOM navigation methods (Element#up, Element#down, Element#previous, Element#next) for no-argument calls. Closes #7848.

Files:

• spinoffs/prototype/trunk/CHANGELOG (modified) (1 diff)
• spinoffs/prototype/trunk/src/dom.js (modified) (5 diffs)
• spinoffs/prototype/trunk/test/unit/dom.html (modified) (1 diff)

spinoffs/prototype/trunk/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Optimize DOM navigation methods (Element#up, Element#down, Element#previous, Element#next) for no-argument calls.  Closes #7848.  [haraldmartin, sam]
+
+* Add Element#firstDescendant to retrieve the first non-text child node of an element.  [sam]
-
-* Element.addMethods should add methods to Element as well as Element.Methods.  Closes #7888.  [Andrew Dupont]

spinoffs/prototype/trunk/src/dom.js

@@ -153 +153 @@
-  },
-  
+  firstDescendant: function(element) {
+    element = $(element).firstChild;
+    while (element && element.nodeType != 1) element = element.nextSibling;
+    return $(element);
+  },
+  
-  immediateDescendants: function(element) {
-    if (!(element = $(element).firstChild)) return [];
@@ -180 +186 @@
-  
-  up: function(element, expression, index) {
-
+
+
+
-    return expression ? Selector.findElement(ancestors, expression, index) :
-      ancestors[index || 0];
@@ -186 +194 @@
-  
-  down: function(element, expression, index) {
-
+
+
+
-    return expression ? Selector.findElement(descendants, expression, index) :
-      descendants[index || 0];
@@ -192 +202 @@
-
-  previous: function(element, expression, index) {
-
+
+
+
-    return expression ? Selector.findElement(previousSiblings, expression, index) :
-      previousSiblings[index || 0];
@@ -198 +210 @@
-  
-  next: function(element, expression, index) {
-
+
+
+
-    return expression ? Selector.findElement(nextSiblings, expression, index) :
-      nextSiblings[index || 0];

spinoffs/prototype/trunk/test/unit/dom.html

@@ -480 +480 @@
-    }},
-    
+    testElementFirstDescendant: function() {with(this) {
+      assertElementMatches($('navigation_test').firstDescendant(), 'li.first');
+      assertNull($('navigation_test_next_sibling').firstDescendant());
+    }},
+    
-    testElementImmediateDescendants: function() {with(this) {
-      assertElementsMatch($('navigation_test').immediateDescendants(),