Changeset 6183

Timestamp:

02/21/07 03:24:50 (1 year ago)

Author:

andrew

Message:

First commit on the selector branch. Complete overhaul of $$ as started in #7568. Still not complete, but implements nearly all of CSS3 (missing only a few pseudoclasses).

Files:

• spinoffs/prototype/branches/selector/src/selector.js (modified) (2 diffs)
• spinoffs/prototype/branches/selector/test/unit/selector.html (modified) (4 diffs)

spinoffs/prototype/branches/selector/src/selector.js

@@ -1 +1 @@
-var Selector = Class.create();
+
-Selector.prototype = {
-  initialize: function(expression) {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    return results;
-  },
-
-  toString: function() {
-    return this.expression;
-  }
-}
-
-Object.extend(Selector, {
-  matchElements: function(elements, expression) {
-    var selector = new Selector(expression);
-    return elements.select(selector.match.bind(selector)).map(Element.extend);
-  },
-  
-  findElement: function(elements, expression, index) {
-
+
+
+
-    return Selector.matchElements(elements, expression || '*')[index || 0];
-  },
-  
-  findChildElements: function(element, expressions) {
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-  }
-});
@@ -128 +497 @@
-  return Selector.findChildElements(document, $A(arguments));
-}
+
+
+// TODO:
+// (remaining pseudoclasses)
+// nth-last-child
+// nth-of-type
+// nth-last-of-type
+//

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

@@ -38 +38 @@
-    therefore its ID property won't be 'troubleForm': -->
-  <form id="troubleForm"><input type="hidden" name="id" /></form>
-
+
+
+
+
+
+
+
+
+
-
-<!-- Log output -->
@@ -47 +55 @@
-// <![CDATA[
-  new Test.Unit.Runner({
+    
-    testSelectorWithTagName: function() {with(this) {
-      assertEnumEqual($A(document.getElementsByTagName('li')), $$('li'));
@@ -126 +135 @@
-    }},
-    
+    testSelectorWithSubstringAttributeValues: function() {with(this) {
+      assertEnumEqual($('father', 'uncle'), $$('div[class^=bro]'), 'matching beginning of string');
+      assertEnumEqual($('father', 'uncle'), $$('div[class$=men]'), 'matching end of string');
+      assertEnumEqual($('father', 'uncle'), $$('div[class*="ers m"]'), 'matching substring')
+    }},
+    
-    test$$WithNestedAttributeSelectors: function() {with(this) {
-      assertEnumEqual([$('strong')], $$('div[style] p[id] strong'));
@@ -150 +165 @@
-    testSelectorWithSpaceInAttributeValue: function() {with(this) {
-      assertEnumEqual([$('with_title')], $$('cite[title="hello world!"]'));
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  }, 'testlog');
-// ]]>