Ticket #5170: selectors.diff

test/unit/selector.html

@@ -24 +24 @@
-  <h1 class="title">Some title <span>here</span></h1>
-  <p id="p" class="first summary">
-    <strong id="strong">This</strong> is a short blurb
-
-
+title="link" 
+ title=""
-  </p>
-  <ul id="list">
-    <li id="item_1" class="first"><a id="link_3" href="#" class="external"><span id="span">Another link</span></a></li>
-
-               <li id="item_3" xml:lang="es-us" class
+ xml:lang="en"
+    <li id="item_3" xml:lang="es-us" class="" title
-  </ul>
+  <ol>
+        <li id="item_4"><a id="link_4" href="#header">a last link</a></li>
+  </ol>
-</div>
-
-<!-- Log output -->
@@ -94 +97 @@
-      assertEnumEqual($('link_1', 'link_2', 'item_1', 'item_2', 'item_3'), $$('#p a', ' ul#list li '));
-    }},
-
-
+Class
-                        assertEnumEqual($$('#fixtures h1'), $$('h1[class]'));
-                        assertEnumEqual($$('#fixtures h1'), $$('h1[CLASS]'));
-                        assertEnumEqual([$('item_3')], $$('li#item_3[class]'));
+                        assertEnumEqual([], $$('#link_4[class]'));
-                }},
+
+                testSelectorWithTagNameAndNegatedClassAttributeExistence: function() {with(this) {
+                        assertEnumEqual([], $$('#fixtures h1:not([class])'));
+                        assertEnumEqual([], $$('#fixtures h1:not([CLASS])'));
+                        assertEnumEqual([], $$('#item_3:not([class])'));
+                        assertEnumEqual([$('link_4')], $$('#link_4:not([class])'));
+                        
+                }},
-                
+                testSelectorWithTagNameAndOtherAttributeExistence: function() {with(this) {
+                        assertEnumEqual([$('item_3')], $$('li#item_3[title]'));
+                }},
+                
+                testSelectorWithTagNameAndNegatedOtherAttributeExistence: function() {with(this) {
+                        assertEnumEqual([], $$('li#item_3:not([title])'));
+                }}, 
+                
-                testSelectorWithTagNameAndSpecificAttributeValue: function() {with(this) {
-                        assertEnumEqual($('link_1', 'link_2', 'link_3'), $$('a[href="#"]'));
-                        assertEnumEqual($('link_1', 'link_2', 'link_3'), $$('a[href=#]'));
-                }},
-                
+                testSelectorWithTagNameAndNegatedSpecificAttributeValue: function() {with(this) {
+                        assertEnumEqual([$('link_4')], $$('a:not([href="#"])'));
+                        assertEnumEqual([$('link_4')], $$('a:not([href=#])'));
+                }},
+                
+                testSelectorWithTagNameAndEmptySpecificAttributeValue: function() {with(this) {
+                        assertEnumEqual([$('item_3')], $$('li[title=""]'));
+                        assertEnumEqual([$('item_3')], $$('li[title=]'));
+                        
+                }},
+                
+                testSelectorWithTagNameAndNegatedEmptySpecificAttributeValue: function() {with(this) {
+                        assertEnumEqual($('link_1', 'link_3', 'link_4'), $$('a:not([title=""])'));
+                        assertEnumEqual($('link_1', 'link_3', 'link_4'), $$('a:not([title=])'));
+                        
+                }},             
-                testSelectorWithTagNameAndWhitespaceTokenizedAttributeValue: function() {with(this) {
-                        assertEnumEqual($('link_1', 'link_2'), $$('a[class~="internal"]'));
-                        assertEnumEqual($('link_1', 'link_2'), $$('a[class~=internal]'));
+                        }},
+
+                testSelectorWithTagNameAndNegatedWhitespaceTokenizedAttributeValue: function() {with(this) {
+                        assertEnumEqual($('link_3', 'link_4'), $$('a:not([class~="internal"])'));
+                        assertEnumEqual($('link_3', 'link_4'), $$('a:not([class~=internal])'));
-                }},
-                
-                testSelectorWithUniversalAndHyphenTokenizedAttributeValue: function() {with(this) {
-                        assertEnumEqual([$('item_3')], $$('*[xml:lang|="es"]'));
-                        assertEnumEqual([$('item_3')], $$('*[xml:lang|="ES"]'));
+
+                        }},
+
+                testSelectorWithUniversalAndHyphenTokenizedAttributeValue: function() {with(this) {
+                        assertEnumEqual($('item_1', 'item_2', 'item_4'), $$('li:not([xml:lang|="es"])'));
+                        assertEnumEqual($('item_1', 'item_2', 'item_4'), $$('li:not([xml:lang|="ES"])'));
+
+
-                }},
-                
-
-
+
+
+
+
-                }},
-                
+                testSelectorWithTagNameAndNegatedAttributeValueStartingWithString: function() {with(this) {
+                  assertEnumEqual($('link_1', 'link_2', 'link_3'), $$('a:not([href^="#hea"])'));
+                  assertEnumEqual([], $$('a:not([href^=#])'));
+                }},
+                
+                testSelectorWithTagNameAndAttributeValueEndingWithString: function() {with(this) {
+                  assertEnumEqual([$('link_4')], $$('a[href$="der"]'));
+                  assertEnumEqual([$('link_4')], $$('a[href$=der]'));
+                }},
+                
+                testSelectorWithTagNameAndNegatedAttributeValueEndingWithString: function() {with(this) {
+                  assertEnumEqual($('link_1', 'link_2', 'link_3'), $$('a:not([href$="der"])'));
+                  assertEnumEqual($('link_1', 'link_2', 'link_3'), $$('a:not([href$=der])'));
+                }},
+                
+                testSelectorWithTagNameAndAttributeValueContainingString: function() {with(this) {
+                  assertEnumEqual([$('link_4')], $$('a[href*="head"]'));
+                  assertEnumEqual([$('link_4')], $$('a[href*=head]'));
+                  assertEnumEqual([$('link_4')], $$('a[href*=#header]'));
+                  assertEnumEqual($('link_1', 'link_2', 'link_3', 'link_4'), $$('a[href*=#]'));
+                }},
+                
+                testSelectorWithTagNameAndNegatedAttributeValueContainingString: function() {with(this) {
+                  assertEnumEqual($('link_1', 'link_2', 'link_3'), $$('a:not([href*="head"])'));
+                  assertEnumEqual($('link_1', 'link_2', 'link_3'), $$('a:not([href*=head])'));
+                  assertEnumEqual($('link_1', 'link_2', 'link_3'), $$('a:not([href*=#header])   '));
+                  assertEnumEqual([], $$('a:not([href*=#])'));
+                }},
+                
-                test$$WithNestedAttributeSelectors: function() {with(this) {
-                  assertEnumEqual([$('strong')], $$('div[style] p[id] strong'));
-                }},
-                
-                testSelectorWithMultipleConditions: function() {with(this) {
-
-
+
+
+
+
+
+
+
+
+
-                }}
-  }, 'testlog');
-// ]]>

test/test.css

@@ +1 @@
+body {
+        font-family: verdana, sans-serif;
+        font-size: 12px;
+}
+
+td {
+        padding: 5px;
+}
+
+.passed td {
+        border: 2px solid #090;
+        background: #af0;
+}
+
+.failed td {
+        border: 2px solid #e00;
+        background: #fcc;
+}
+
+.error td {
+        border: 2px solid #000;
+        background: #333;
+        color: #fff;
+}

src/selector.js

@@ -13 +13 @@
-    if (this.expression == '')  abort('empty expression');
-
-    var params = this.params, expr = this.expression, match, modifier, clause, rest;
-)\[([a-z0-9_:-]+?)(?:([~\|!]?=)(?:"([^"]*)"|([^\]\s]*)))?\]
+?)(\:not\()?\[([a-z0-9_:-]+?)(?:([~\|^$*]?=)(?:"([^"]*)"|([^\]\s]*)))?\](\))?
-      params.attributes = params.attributes || [];
-ame: match[2], operator: match[3], value: match[4] || match[5
+egation: (match[2] + match[7] == ':not()'), name: match[3], operator: match[4], value: match[5] || match[6
-      expr = match[1];
-    }
-
-    if (expr == '*') return this.params.wildcard = true;
-
+
-    while (match = expr.match(/^([^a-z0-9_-])?([a-z0-9_-]+)(.*)/i)) {
-      modifier = match[1], clause = match[2], rest = match[3];
-      switch (modifier) {
@@ -32 +32 @@
-      }
-      expr = rest;
-    }
-
+
-    if (expr.length > 0) abort(expr.inspect());
-  },
-
-  buildMatchExpression: function() {
-    var params = this.params, conditions = [], clause;
-
-    if (params.wildcard)
-      conditions.push('true');
-    if (clause = params.id)
@@ -50 +49 @@
-        conditions.push('Element.hasClassName(element, ' + clause[i].inspect() + ')');
-    if (clause = params.attributes) {
-      clause.each(function(attribute) {
-
+
+
+
+
+
+
+
-        var splitValueBy = function(delimiter) {
-value + ' && ' + value
+attr
-        }
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-      });
-    }
-
-    return conditions.join(' && ');
-  },
-
@@ -85 +102 @@
-        if (!scope || Element.childOf(element, scope))
-          return [element];
-
-||
+? this.params.tagName.toLowerCase() :
-
-    var results = [];
-    for (var i = 0; i < scope.length; i++)
-      if (this.match(element = scope[i]))
-        results.push(Element.extend(element));
-
-    return results;
-  },
-