Changeset 8580

Timestamp:

01/06/08 21:49:16 (9 months ago)

Author:

tobie

Message:

prototype: Fix Selector.matchElements to allow for coma-separated selectors in Element#up/next/previous and Event#findElement.

Files:

• spinoffs/prototype/trunk/CHANGELOG (modified) (1 diff)
• spinoffs/prototype/trunk/src/selector.js (modified) (1 diff)
• spinoffs/prototype/trunk/test/lib/unittest.js (modified) (1 diff)
• spinoffs/prototype/trunk/test/unit/dom.html (modified) (4 diffs)
• spinoffs/prototype/trunk/test/unit/event.html (modified) (1 diff)
• spinoffs/prototype/trunk/test/unit/selector.html (modified) (1 diff)

spinoffs/prototype/trunk/CHANGELOG

@@ -1 +1 @@
-*SVN*
+* Fix Selector.matchElements to allow for coma-separated selectors in Element#up/next/previous and Event#findElement. [Samuel Lebeau, Tobie Langel]
-
-* Test.Unit refactoring. Allow running multiple instances of Test.Unit.Runner on the same page. Allow rake to run specific testcases (e.g.: rake test BROWSERS=firefox TESTS=array TESTCASES=testUniq,test$w). Closes #10704, #10705, #10706. [nicwilliams, Tobie Langel]

spinoffs/prototype/trunk/src/selector.js

@@ -619 +619 @@
-
-  matchElements: function(elements, expression) {
-new Selector(expression).findElements(
+$$(expression
-    h.mark(matches);
-    for (var i = 0, results = [], element; element = elements[i]; i++)

spinoffs/prototype/trunk/test/lib/unittest.js

@@ -446 +446 @@
-  initialize: function(name, test, setup, teardown) {
-    this.name           = name;
-
-
+    
+   
-    this.teardown       = teardown || Prototype.emptyFunction;
-    this.messages       = [];

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

@@ -943 +943 @@
-      assertEqual(undefined, element.up('garbage'));
-      assertEqual(undefined, element.up(6));
+      assertElementMatches(element.up('.non-existant, ul'), 'ul');
-      
-      var dummy = $(document.createElement('DIV'));
@@ -956 +957 @@
-      assertElementMatches(element.down('li', 5), 'li.last');
-      assertElementMatches(element.down('ul').down('li', 1), 'li#navigation_test_f');
+      assertElementMatches(element.down('.non-existant, .first'), 'li.first');
-      
-      var dummy = $(document.createElement('DIV'));
@@ -969 +971 @@
-      assertEqual(undefined, element.previous(3));
-      assertEqual(undefined, $('navigation_test').down().previous());
+      assertElementMatches(element.previous('.non-existant, .first'), 'li.first');
-      
-      var dummy = $(document.createElement('DIV'));
@@ -983 +986 @@
-      assertEqual(undefined, element.next(3));
-      assertEqual(undefined, element.next(2).next());
+      assertElementMatches(element.next('.non-existant, .last'), 'li.last');
-      
-      var dummy = $(document.createElement('DIV'));

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

@@ -236 +236 @@
-      var span = $("span"), event;
-      event = span.fire("test:somethingHappened");
-qual(span, event.findElement()
-qual(span, event.findElement('span')
-qual($("inner"), event.findElement('p')
+lementMatches(event.findElement(), 'span#span'
+lementMatches(event.findElement('span'), 'span#span'
+lementMatches(event.findElement('p'), 'p#inner'
-      assertEqual(null, event.findElement('div.does_not_exist'));
+      assertElementMatches(event.findElement('.does_not_exist, span'), 'span#span');
-    }}
-    
-    
-  });
-

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

@@ -216 +216 @@
-      assertElementsMatch(Selector.matchElements($('fixtures').descendants(), 'a.internal'), '#link_1', '#link_2');
-      assertEnumEqual([], Selector.matchElements($('fixtures').descendants(), 'p.last'));
+      assertElementsMatch(Selector.matchElements($('fixtures').descendants(), '.inexistant, a.internal'), '#link_1', '#link_2');
-    }},
-