Ticket #7873: final_selectors_patch.diff

src/selector.js

@@ -162 +162 @@
-      'only-of-type':   function(m) {
-        var p = Selector.xpath.pseudos; return p['first-of-type'](m) + p['last-of-type'](m);
-      },
-predicate
-
+fragment
+, predicate
-        if (formula == 'even') formula = '2n+0';
-        if (formula == 'odd')  formula = '2n+1';
-        if (mm = formula.match(/^(\d+)$/)) // digit only
-
-
+
+
+
-          var a = mm[1] ? Number(mm[1]) : 1;
-
-
+
+
+
+
+
-        }
-        return "[" + predicate + "]";        
-      }
-    }
-  },
@@ -265 +268 @@
-    descendant: function(nodes) {
-      var h = Selector.handlers;
-      for (var i = 0, results = [], node; node = nodes[i]; i++)
-Element.descendants(node
+node.getElementsByTagName('*'
-      return results;
-    },
-    
-    child: function(nodes) {
-      var h = Selector.handlers;
-
-
+
+
+
+
-      return results;
-    },
-    
@@ -432 +437 @@
-      return p['last-of-type'](p['first-of-type'](nodes, formula, root), formula, root);
-    },
-    
+    // handles the an+b logic
+    getIndices: function(a, b, total) {
+      if (a == 0) return b > 0 ? [b] : [];
+      return $R(1, total).inject([], function(memo, i) {
+        if (0 == (i - b) % a && (i - b) / a >= 0) memo.push(i);
+        return memo;
+      });
+    },
+    
-    // handles nth(-last)-child, nth(-last)-of-type, and (first|last)-of-type
-    nth: function(nodes, formula, root, reverse, ofType) {
+      if (nodes.length == 0) return [];
-      if (formula == 'even') formula = '2n+0';
-      if (formula == 'odd')  formula = '2n+1';
-      var h = Selector.handlers, results = [], indexed = [], m;
@@ -448 +463 @@
-        formula = Number(formula);
-        for (var i = 0, node; node = nodes[i]; i++)
-          if (node.nodeIndex == formula) results.push(node);
-
+
+
-        var a = m[1] ? Number(m[1]) : 1;
-
-
-
+
+
+
+
+
+
-      }
-      h.unmark(nodes);
-      h.unmark(indexed);