Ticket #8401: gEBCN.diff

test/unit/dom.html

@@ -207 +207 @@
-  <ul class="A B" id="class_names_ul">
-    <li class="C"></li>
-    <li class="A C"></li>
+    <li class="1"></li>
-  </ul>
-  <div class="B C D"></div>
-</div>
@@ -381 +382 @@
-    }},
-    
-    testGetElementsByClassName: function() {with(this) {
+      var div = $('class_names'), list = $('class_names_ul');
+
-      assertElementsMatch(document.getElementsByClassName('A'), 'p.A', 'ul#class_names_ul.A', 'li.A.C');
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-    }},
-
-    testElementInsertWithHTML: function() {with(this) {

test/lib/unittest.js

@@ -484 +484 @@
-  assertElementsMatch: function() {
-    var expressions = $A(arguments), elements = $A(expressions.shift());
-    if (elements.length != expressions.length) {
-
+ (' + expressions.inspect() + ')
-      return false;
-    }
-    elements.zip(expressions).all(function(pair, index) {

src/dom.js

@@ -18 +18 @@
-      results.push(query.snapshotItem(i));
-    return results;
-  };
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-/*--------------------------------------------------------------------------*/
-
@@ -617 +602 @@
-  }
-};
-
+if (!document.getElementsByClassName) {
+  Element.Methods.getElementsByClassName = Prototype.BrowserFeatures.XPath ?
+  function(element, className) {
+    var iter = function(name) { return "[contains(concat(' ', @class, ' '), ' " + name + " ')]" };
+    var q = './/*' + (/\s/.test(className) ? $w(className.toString()).map(iter).join('') : iter(className));
+    return document._getElementsByXPath(q, element);
+  } : function(element, className) {
+    var children = $(element).getElementsByTagName('*');
+    var elements = [], classNames = $w(className.toString());
+    className = ' ' + className + ' ';
+
+    for (var i = 0, child, cn; child = children[i]; i++) {
+      if (child.className && (cn = ' ' + child.className + ' ') && (cn.include(className) ||
+          classNames.all(function(name) { return cn.include(' ' + name + ' ') })))
+        elements.push(Element.extend(child));
+    }
+    return elements;
+  };
+
+  document.getElementsByClassName = function(className, parentElement) {
+    return $(parentElement || document.body).getElementsByClassName(className);
+  }
+}
+
-Object.extend(Element.Methods, {
-  childElements: Element.Methods.immediateDescendants
-});