Ticket #7848: update2.patch

src/dom.js

@@ -151 +151 @@
-  descendants: function(element) {
-    return $A($(element).getElementsByTagName('*')).each(Element.extend);
-  },
-  
-  immediateDescendants: function(element) {
-    if (!(element = $(element).firstChild)) return [];
-    while (element && element.nodeType != 1) element = element.nextSibling;
-    if (element) return [element].concat($(element).nextSiblings());
-    return [];
-  },
-
-  previousSiblings: function(element) {
-    return $(element).recursivelyCollect('previousSibling');
@@ -179 +172 @@
-  },
-  
-  up: function(element, expression, index) {
+    if (arguments.length == 1) return $(element.parentNode);
-    var ancestors = $(element).ancestors();
-    return expression ? Selector.findElement(ancestors, expression, index) :
-      ancestors[index || 0];
-  },
-  
-  down: function(element, expression, index) {
-    var descendants = $(element).descendants();
-    return expression ? Selector.findElement(descendants, expression, index) :
-      descendants[index || 0];
-  },
-
-  previous: function(element, expression, index) {
+    if (arguments.length == 1)
+      return $(Selector.handlers.previousElementSibling(element));
-    var previousSiblings = $(element).previousSiblings();
-    return expression ? Selector.findElement(previousSiblings, expression, index) :
-      previousSiblings[index || 0];
-  },
-
+
-  next: function(element, expression, index) {
+    if (arguments.length == 1) 
+      return $(Selector.handlers.nextElementSibling(element));
-    var nextSiblings = $(element).nextSiblings();
-    return expression ? Selector.findElement(nextSiblings, expression, index) :
-      nextSiblings[index || 0];
@@ -412 +404 @@
-  }  
-};
-
+Object.extend(Element.Methods, (function() {
+  function findChildNodes(element, single) {
+    var returning = single ? null : [];
+    if (!(element = $(element).firstChild)) return returning;
+    while (element && element.nodeType != 1) element = element.nextSibling;
+    if (element) return single ? element : [element].concat($(element).nextSiblings());
+    return returning;    
+  }
+
+  return {
+    immediateDescendants: function(element) {
+      return findChildNodes(element);
+    },
+
+    down: function(element, expression, index) {
+      if (arguments.length == 1) return findChildNodes(element, true);
+      var descendants = $(element).descendants();
+      return expression ? Selector.findElement(descendants, expression, index) :
+        descendants[index || 0];
+    }
+  }
+})());
+
-Object.extend(Element.Methods, {childOf: Element.Methods.descendantOf});
-
-if (Prototype.Browser.Opera) {