Ticket #6418: 6418.patch

_base/query.js

@@ -683 +683 @@
                                 // based version might be more accurate, but since
                                 // jQuery and DomQuery also potentially get this wrong,
                                 // I'm leaving it for now.
+                                if(condition.charAt(0)=='"' || condition.charAt(0)=="'"){//remove quote
+                                        condition=condition.substr(1,condition.length-2);
+                                }
                                 return (elem.innerHTML.indexOf(condition) >= 0);
                         }
                 },
@@ -695 +698 @@
                 "nth-child": function(name, condition){
                         var pi = parseInt;
                         if(condition == "odd"){
-                                return function(elem){
-                                        return (
-                                                ((getNodeIndex(elem)) % 2) == 1
-                                        );
+                                condition = "2n+1";
+                        }else if(condition == "even"){
+                                condition = "2n";
+                        }
+                        if(condition.indexOf("n") != -1){
+                                var tparts = condition.split("n", 2);
+                                var pred = tparts[0]?(tparts[0]=='-'?-1:pi(tparts[0])):1;
+                                var idx = tparts[1]?pi(tparts[1]):0;
+                                var lb = 0, ub = -1;
+                                if(pred>0){
+                                        if(idx<0){
+                                                idx = idx%pred && (pred + idx%pred);
+                                        }else if(idx>0){
+                                                if(idx >= pred){
+                                                        lb = idx - idx % pred;
+                                                }
+                                                idx = idx % pred;
+                                        }
+                                }else if(pred<0){
+                                        pred *= -1;
+                                        if(idx>0){
+                                                ub = idx;
+                                                idx = idx % pred;
+                                        } //idx has to be greater than 0 when pred is negative; shall we throw an error here?
                                 }
-                        }else if((condition == "2n")||
-                                (condition == "even")){
-                                return function(elem){
-                                        return ((getNodeIndex(elem) % 2) == 0);
+                                if(pred>0){
+                                        return function(elem){
+                                                var i=getNodeIndex(elem);
+                                                return i>=lb && (ub<0 || i<=ub) && ((i % pred) == idx);
+                                        }
+                                }else{
+                                        condition=idx;
                                 }
-                        }else if(condition.indexOf("0n+") == 0){
-                                var ncount = pi(condition.substr(3));
-                                return function(elem){
-                                        return (elem.parentNode[childNodesName][ncount-1] === elem);
-                                }
-                        }else if(       (condition.indexOf("n+") > 0) &&
-                                                (condition.length > 3) ){
-                                var tparts = condition.split("n+", 2);
-                                var pred = pi(tparts[0]);
-                                var idx = pi(tparts[1]);
-                                return function(elem){
-                                        return ((getNodeIndex(elem) % pred) == idx);
-                                }
-                        }else if(condition.indexOf("n") == -1){
-                                var ncount = pi(condition);
-                                return function(elem){
-                                        return (getNodeIndex(elem) == ncount);
-                                }
                         }
+                        //if(condition.indexOf("n") == -1){
+                        var ncount = pi(condition);
+                        return function(elem){
+                                return (getNodeIndex(elem) == ncount);
+                        }
                 }
         };
 
@@ -809 +822 @@
                 if(query.tag && query.id && !query.hasLoops){
                         // we got a filtered ID search (e.g., "h4#thinger")
                         retFunc = function(root){
-                                var te = d.byId(query.id);
+                                var te = d.byId(query.id,root.ownerDocument||root); //root itself may be a document
                                 if(filterFunc(te)){
                                         return [ te ];
                                 }

tests/_base/query.html

@@ -89 +89 @@
                                                 "doh.is(3, dojo.query('#t h3:nth-child(2n+1)').length);",
                                                 "doh.is(1, dojo.query('#t h3:nth-child(even)').length);",
                                                 "doh.is(1, dojo.query('#t h3:nth-child(2n)').length);",
-                                                "doh.is(0, dojo.query('#t h3:nth-child(2n+3)').length);",
+                                                "doh.is(1, dojo.query('#t h3:nth-child(2n+3)').length);",
                                                 "doh.is(2, dojo.query('#t h3:nth-child(1)').length);",
                                                 "doh.is(1, dojo.query('#t > h3:nth-child(1)').length);",
                                                 "doh.is(3, dojo.query('#t :nth-child(3)').length);",
                                                 "doh.is(0, dojo.query('#t > div:nth-child(1)').length);",
                                                 "doh.is(7, dojo.query('#t span').length);",
+                                                "doh.is(3, dojo.query('#t > *:nth-child(n+10)').length);",
+                                                "doh.is(1, dojo.query('#t > *:nth-child(n+12)').length);",
+                                                "doh.is(10, dojo.query('#t > *:nth-child(-n+10)').length);",
+                                                "doh.is(5, dojo.query('#t > *:nth-child(-2n+10)').length);",
+                                                "doh.is(6, dojo.query('#t > *:nth-child(2n+2)').length);",
+                                                "doh.is(5, dojo.query('#t > *:nth-child(2n+4)').length);",
+                                                "doh.is(5, dojo.query('#t > *:nth-child(2n+4)').length);",
+                                                "doh.is(12, dojo.query('#t > *:nth-child(n-5)').length);",
+                                                "doh.is(6, dojo.query('#t > *:nth-child(2n-5)').length);",
+                                                
                                                 // :empty pseudo-selector
                                                 "doh.is(4, dojo.query('#t > span:empty').length);",
                                                 "doh.is(6, dojo.query('#t span:empty').length);",