From 1662d931e95759114fd960f981c846dbbc38ed4c Mon Sep 17 00:00:00 2001
From: Dustin Diaz <polvero@gmail.com>
Date: Tue, 13 Dec 2011 15:12:20 -0800
Subject: [PATCH] - minor cosmetics. bump minor version for 'form' checks

---
 package.json |  2 +-
 qwery.js     | 21 ++++++++++-----------
 qwery.min.js |  2 +-
 src/qwery.js | 19 +++++++++----------
 4 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/package.json b/package.json
index 1e0f8c8..ad8bfec 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "qwery"
   , "description": "blazing fast CSS3 query selector engine"
-  , "version": "3.2.0"
+  , "version": "3.2.2"
   , "homepage": "https://github.com/ded/qwery"
   , "author": "Dustin Diaz <dustin@dustindiaz.com> (http://dustindiaz.com)"
   , "contributors": [
diff --git a/qwery.js b/qwery.js
index 49e1f46..f957486 100644
--- a/qwery.js
+++ b/qwery.js
@@ -221,22 +221,21 @@
     return (cand = crawl(el, tokens.length - 1, el)) && (!root || isAncestor(cand, root))
   }
 
-  function isNode(el) {
-    return el && typeof el === 'object' && el.nodeType && (el.nodeType == 1 || el.nodeType == 9)
+  function isNode(el, t) {
+    return el && typeof el === 'object' && (t = el.nodeType) && (t == 1 || t == 9)
   }
 
   function uniq(ar) {
-    var r = [], i = 0, j = 0, k, item, inIt
-    for (; item = ar[i]; ++i) {
-      inIt = false
-      for (k = 0; k < r.length; ++k) {
-        if (r[k] === item) {
-          inIt = true; break
+    var a = [], i, j
+    o: for (i = 0; i < ar.length; ++i) {
+      for (j = 0; j < a.length; ++j) {
+        if (a[j] == ar[i]) {
+          continue o
         }
       }
-      if (!inIt) r[j++] = item
+      a[a.length] = ar[i]
     }
-    return r
+    return a
   }
 
   function arrayLike(o) {
@@ -246,7 +245,7 @@
   function normalizeRoot(root) {
     if (!root) return doc
     if (typeof root == 'string') return qwery(root)[0]
-    if (arrayLike(root)) return root[0]
+    if (!root.nodeType && arrayLike(root)) return root[0]
     return root
   }
 
diff --git a/qwery.min.js b/qwery.min.js
index 4fc7b01..65e4512 100644
--- a/qwery.min.js
+++ b/qwery.min.js
@@ -4,4 +4,4 @@
   * copyright Dustin Diaz & Jacob Thornton 2011
   * MIT License
   */
-!function(a,b){typeof module!="undefined"?module.exports=b():typeof define=="function"&&typeof define.amd=="object"?define(b):this[a]=b()}("qwery",function(){function B(){this.c={}}function G(a){return C.g(a)||C.s(a,new RegExp("(^|\\s+)"+a+"(\\s+|$)"))}function H(a,b){var c=0,d=a.length;for(;c<d;c++)b.call(null,a[c])}function I(a){for(var b=[],c=0,d=a.length;c<d;++c)U(a[c])?b=b.concat(a[c]):b[b.length]=a[c];return b}function J(a){var b=0,c=a.length,d=[];for(;b<c;b++)d[b]=a[b];return d}function K(a){while(a=a.previousSibling)if(a.nodeType==1)break;return a}function L(a){return a.match(y)}function M(a,b,c,d,e,f,g,j,k,l,m){var n,o,p,q,r;if(this.nodeType!==1)return!1;if(b&&b!=="*"&&this.tagName&&this.tagName.toLowerCase()!==b)return!1;if(c&&(o=c.match(h))&&o[1]!==this.id)return!1;if(c&&(r=c.match(i)))for(n=r.length;n--;)if(!G(r[n].slice(1)).test(this.className))return!1;if(k&&X.pseudos[k]&&!X.pseudos[k](this,m))return!1;if(d&&!g){q=this.attributes;for(p in q)if(Object.prototype.hasOwnProperty.call(q,p)&&(q[p].name||p)==e)return this}return d&&!O(f,$(this,e)||"",g)?!1:this}function N(a){return D.g(a)||D.s(a,a.replace(s,"\\$1"))}function O(a,b,c){switch(a){case"=":return b==c;case"^=":return b.match(E.g("^="+c)||E.s("^="+c,new RegExp("^"+N(c))));case"$=":return b.match(E.g("$="+c)||E.s("$="+c,new RegExp(N(c)+"$")));case"*=":return b.match(E.g(c)||E.s(c,new RegExp(N(c))));case"~=":return b.match(E.g("~="+c)||E.s("~="+c,new RegExp("(?:^|\\s+)"+N(c)+"(?:\\s+|$)")));case"|=":return b.match(E.g("|="+c)||E.s("|="+c,new RegExp("^"+N(c)+"(-|$)")))}return 0}function P(a,b){var c=[],d=[],e,g,h,i,k,l,m,n,o=b,p=F.g(a)||F.s(a,a.split(x)),q=a.match(w);if(!p.length)return c;i=(p=p.slice(0)).pop(),p.length&&(h=p[p.length-1].match(j))&&(o=W(b,h[1]));if(!o)return c;m=L(i),l=o!==b&&o.nodeType!==9&&q&&/^[+~]$/.test(q[q.length-1])?function(a){while(o=o.nextSibling)o.nodeType==1&&(m[1]?m[1]==o.tagName.toLowerCase():1)&&(a[a.length]=o);return a}([]):o[f](m[1]||"*");for(e=0,g=l.length;e<g;e++)if(n=M.apply(l[e],m))c[c.length]=n;return p.length?(H(c,function(a){R(a,p,q)&&(d[d.length]=a)}),d):c}function Q(a,b,c){if(S(b))return a==b;if(U(b))return!!~I(b).indexOf(a);var d=b.split(","),e,f;while(b=d.pop()){e=F.g(b)||F.s(b,b.split(x)),f=b.match(w),e=e.slice(0);if(M.apply(a,L(e.pop()))&&(!e.length||R(a,e,f,c)))return!0}return!1}function R(a,b,c,d){function f(a,d,g){while(g=A[c[d]](g,a))if(S(g)&&(found=M.apply(g,L(b[d])))){if(!d)return g;if(e=f(g,d-1,g))return e}}var e;return(e=f(a,b.length-1,a))&&(!d||Z(e,d))}function S(a){return a&&typeof a=="object"&&a.nodeType&&(a.nodeType==1||a.nodeType==9)}function T(a){var b=[],c=0,d=0,e,f,g;for(;f=a[c];++c){g=!1;for(e=0;e<b.length;++e)if(b[e]===f){g=!0;break}g||(b[d++]=f)}return b}function U(a){return typeof a=="object"&&isFinite(a.length)}function V(a){return a?typeof a=="string"?X(a)[0]:U(a)?a[0]:a:b}function W(a,b,c){return a.nodeType===9?a.getElementById(b):a.ownerDocument&&((c=a.ownerDocument.getElementById(b))&&Z(c,a)&&c||!Z(a,a.ownerDocument)&&bd('[id="'+b+'"]',a)[0])}function X(a,b){var c,d,g=V(b);if(!g||!a)return[];if(a===window||S(a))return!b||a!==window&&S(g)&&Z(a,g)?[a]:[];if(a&&U(a))return I(a);if(c=a.match(n)){if(c[1])return(d=W(g,c[1]))?[d]:[];if(c[2])return J(g[f](c[2]));if(_&&c[3])return J(g[e](c[3]))}return bd(a,g)}function Y(a,b){return function(c){var d,e;if(o.test(c)){a.nodeType!==9&&((e=d=a.getAttribute("id"))||a.setAttribute("id",e="__qwerymeupscotty"),c='[id="'+e+'"]'+c,b(a.parentNode||a,c,!0),d||a.removeAttribute("id"));return}c.length&&b(a,c,!1)}}var a=this,b=document,c=a.qwery,d=b.documentElement,e="getElementsByClassName",f="getElementsByTagName",g="querySelectorAll",h=/#([\w\-]+)/,i=/\.[\w\-]+/g,j=/^#([\w\-]+)$/,k=/^\.([\w\-]+)$/,l=/^([\w\-]+)$/,m=/^([\w]+)?\.([\w\-]+)$/,n=new RegExp(j.source+"|"+l.source+"|"+k.source),o=/(^|,)\s*[>~+]/,p=/^\s+|\s*([,\s\+\~>]|$)\s*/g,q=/[\s\>\+\~]/,r=/(?![\s\w\-\/\?\&\=\:\.\(\)\!,@#%<>\{\}\$\*\^'"]*\]|[\s\w\+\-]*\))/,s=/([.*+?\^=!:${}()|\[\]\/\\])/g,t=/^(\*|[a-z0-9]+)?(?:([\.\#]+[\w\-\.#]+)?)/,u=/\[([\w\-]+)(?:([\|\^\$\*\~]?\=)['"]?([ \w\-\/\?\&\=\:\.\(\)\!,@#%<>\{\}\$\*\^]+)["']?)?\]/,v=/:([\w\-]+)(\(['"]?([\s\w\+\-]+)['"]?\))?/,w=new RegExp("("+q.source+")"+r.source,"g"),x=new RegExp(q.source+r.source),y=new RegExp(t.source+"("+u.source+")?"+"("+v.source+")?"),z=/^(([\w\-]*[#\.]?[\w\-]+|\*)?(\[[\w\-]+([\~\|]?=['"][ \w\-\/\?\&\=\:\.\(\)\!,@#%<>\{\}\$\*\^]+["'])?\])?(\:(link|visited|active|hover))?([\s>+~\.,]|(?:$)))+$/,A={" ":function(a){return a&&a!==d&&a.parentNode},">":function(a,b){return a&&a.parentNode==b.parentNode&&a.parentNode},"~":function(a){return a&&a.previousSibling},"+":function(a,b,c,d){return a?(c=K(a))&&(d=K(b))&&c==d&&c:!1}};B.prototype={g:function(a){return this.c[a]||undefined},s:function(a,b){return this.c[a]=b}};var C=new B,D=new B,E=new B,F=new B,Z="compareDocumentPosition"in d?function(a,b){return(b.compareDocumentPosition(a)&16)==16}:"contains"in d?function(a,b){return b=b.nodeType===9||b==window?d:b,b!==a&&b.contains(a)}:function(a,b){while(a=a.parentNode)if(a===b)return 1;return 0},$=function(){var a=b.createElement("p");return(a.innerHTML='<a href="#x">x</a>')&&a.firstChild.getAttribute("href")!="#x"?function(a,b){return b==="class"?a.className:b==="href"||b==="src"?a.getAttribute(b,2):a.getAttribute(b)}:function(a,b){return a.getAttribute(b)}}(),_=function(){if(b[e]&&b.querySelector&&b[g])try{var a=b.createElement("p");return a.innerHTML="<a/>",a[g](":nth-of-type(1)").length}catch(c){}return!1}(),ba=function(a,b){var c=[],d,e;try{return b.nodeType===9||!o.test(a)?J(b[g](a)):(H(d=a.split(","),Y(b,function(a,b){e=a[g](b),e.length==1?c[c.length]=e.item(0):e.length&&(c=c.concat(J(e)))})),d.length>1&&c.length>1?T(c):c)}catch(f){}return bc(a,b)},bb=function(a,b){var c,d,e,f,h=[];return a=a.replace(p,"$1"),!o.test(a)&&z.test(a)?J(b[g](a)):(H(f=a.split(","),Y(b,function(a,f,i){d=z.test(f)?a[g](f):P(f,a);for(c=0,e=d.length;c<e;c++)if(a.nodeType===9||i||Z(d[c],b))h[h.length]=d[c]})),f.length>1&&h.length>1?T(h):h)},bc=function(a,b){var c=[],d,e,g,h,i,j;a=a.replace(p,"$1");if(e=a.match(m)){i=G(e[2]),d=b[f](e[1]||"*");for(g=0,h=d.length;g<h;g++)i.test(d[g].className)&&(c[c.length]=d[g]);return c}return H(j=a.split(","),Y(b,function(a,d,e){i=P(d,a);for(g=0,h=i.length;g<h;g++)if(a.nodeType===9||e||Z(i[g],b))c[c.length]=i[g]})),j.length>1&&c.length>1?T(c):c},bd=_?ba:b[g]?bb:bc;return X.uniq=T,X.is=Q,X.pseudos={},X.noConflict=function(){return a.qwery=c,this},X})
\ No newline at end of file
+!function(a,b){typeof module!="undefined"?module.exports=b():typeof define=="function"&&typeof define.amd=="object"?define(b):this[a]=b()}("qwery",function(){function B(){this.c={}}function G(a){return C.g(a)||C.s(a,new RegExp("(^|\\s+)"+a+"(\\s+|$)"))}function H(a,b){var c=0,d=a.length;for(;c<d;c++)b.call(null,a[c])}function I(a){for(var b=[],c=0,d=a.length;c<d;++c)U(a[c])?b=b.concat(a[c]):b[b.length]=a[c];return b}function J(a){var b=0,c=a.length,d=[];for(;b<c;b++)d[b]=a[b];return d}function K(a){while(a=a.previousSibling)if(a.nodeType==1)break;return a}function L(a){return a.match(y)}function M(a,b,c,d,e,f,g,j,k,l,m){var n,o,p,q,r;if(this.nodeType!==1)return!1;if(b&&b!=="*"&&this.tagName&&this.tagName.toLowerCase()!==b)return!1;if(c&&(o=c.match(h))&&o[1]!==this.id)return!1;if(c&&(r=c.match(i)))for(n=r.length;n--;)if(!G(r[n].slice(1)).test(this.className))return!1;if(k&&X.pseudos[k]&&!X.pseudos[k](this,m))return!1;if(d&&!g){q=this.attributes;for(p in q)if(Object.prototype.hasOwnProperty.call(q,p)&&(q[p].name||p)==e)return this}return d&&!O(f,$(this,e)||"",g)?!1:this}function N(a){return D.g(a)||D.s(a,a.replace(s,"\\$1"))}function O(a,b,c){switch(a){case"=":return b==c;case"^=":return b.match(E.g("^="+c)||E.s("^="+c,new RegExp("^"+N(c))));case"$=":return b.match(E.g("$="+c)||E.s("$="+c,new RegExp(N(c)+"$")));case"*=":return b.match(E.g(c)||E.s(c,new RegExp(N(c))));case"~=":return b.match(E.g("~="+c)||E.s("~="+c,new RegExp("(?:^|\\s+)"+N(c)+"(?:\\s+|$)")));case"|=":return b.match(E.g("|="+c)||E.s("|="+c,new RegExp("^"+N(c)+"(-|$)")))}return 0}function P(a,b){var c=[],d=[],e,g,h,i,k,l,m,n,o=b,p=F.g(a)||F.s(a,a.split(x)),q=a.match(w);if(!p.length)return c;i=(p=p.slice(0)).pop(),p.length&&(h=p[p.length-1].match(j))&&(o=W(b,h[1]));if(!o)return c;m=L(i),l=o!==b&&o.nodeType!==9&&q&&/^[+~]$/.test(q[q.length-1])?function(a){while(o=o.nextSibling)o.nodeType==1&&(m[1]?m[1]==o.tagName.toLowerCase():1)&&(a[a.length]=o);return a}([]):o[f](m[1]||"*");for(e=0,g=l.length;e<g;e++)if(n=M.apply(l[e],m))c[c.length]=n;return p.length?(H(c,function(a){R(a,p,q)&&(d[d.length]=a)}),d):c}function Q(a,b,c){if(S(b))return a==b;if(U(b))return!!~I(b).indexOf(a);var d=b.split(","),e,f;while(b=d.pop()){e=F.g(b)||F.s(b,b.split(x)),f=b.match(w),e=e.slice(0);if(M.apply(a,L(e.pop()))&&(!e.length||R(a,e,f,c)))return!0}return!1}function R(a,b,c,d){function f(a,d,g){while(g=A[c[d]](g,a))if(S(g)&&(found=M.apply(g,L(b[d])))){if(!d)return g;if(e=f(g,d-1,g))return e}}var e;return(e=f(a,b.length-1,a))&&(!d||Z(e,d))}function S(a,b){return a&&typeof a=="object"&&(b=a.nodeType)&&(b==1||b==9)}function T(a){var b=[],c,d;a:for(c=0;c<b.length;++c){for(d=0;d<b.length;++d)if(b[d]==b[c])continue a;b[b.length]=b[c]}return b}function U(a){return typeof a=="object"&&isFinite(a.length)}function V(a){return a?typeof a=="string"?X(a)[0]:!a.nodeType&&U(a)?a[0]:a:b}function W(a,b,c){return a.nodeType===9?a.getElementById(b):a.ownerDocument&&((c=a.ownerDocument.getElementById(b))&&Z(c,a)&&c||!Z(a,a.ownerDocument)&&bd('[id="'+b+'"]',a)[0])}function X(a,b){var c,d,g=V(b);if(!g||!a)return[];if(a===window||S(a))return!b||a!==window&&S(g)&&Z(a,g)?[a]:[];if(a&&U(a))return I(a);if(c=a.match(n)){if(c[1])return(d=W(g,c[1]))?[d]:[];if(c[2])return J(g[f](c[2]));if(_&&c[3])return J(g[e](c[3]))}return bd(a,g)}function Y(a,b){return function(c){var d,e;if(o.test(c)){a.nodeType!==9&&((e=d=a.getAttribute("id"))||a.setAttribute("id",e="__qwerymeupscotty"),c='[id="'+e+'"]'+c,b(a.parentNode||a,c,!0),d||a.removeAttribute("id"));return}c.length&&b(a,c,!1)}}var a=this,b=document,c=a.qwery,d=b.documentElement,e="getElementsByClassName",f="getElementsByTagName",g="querySelectorAll",h=/#([\w\-]+)/,i=/\.[\w\-]+/g,j=/^#([\w\-]+)$/,k=/^\.([\w\-]+)$/,l=/^([\w\-]+)$/,m=/^([\w]+)?\.([\w\-]+)$/,n=new RegExp(j.source+"|"+l.source+"|"+k.source),o=/(^|,)\s*[>~+]/,p=/^\s+|\s*([,\s\+\~>]|$)\s*/g,q=/[\s\>\+\~]/,r=/(?![\s\w\-\/\?\&\=\:\.\(\)\!,@#%<>\{\}\$\*\^'"]*\]|[\s\w\+\-]*\))/,s=/([.*+?\^=!:${}()|\[\]\/\\])/g,t=/^(\*|[a-z0-9]+)?(?:([\.\#]+[\w\-\.#]+)?)/,u=/\[([\w\-]+)(?:([\|\^\$\*\~]?\=)['"]?([ \w\-\/\?\&\=\:\.\(\)\!,@#%<>\{\}\$\*\^]+)["']?)?\]/,v=/:([\w\-]+)(\(['"]?([\s\w\+\-]+)['"]?\))?/,w=new RegExp("("+q.source+")"+r.source,"g"),x=new RegExp(q.source+r.source),y=new RegExp(t.source+"("+u.source+")?"+"("+v.source+")?"),z=/^(([\w\-]*[#\.]?[\w\-]+|\*)?(\[[\w\-]+([\~\|]?=['"][ \w\-\/\?\&\=\:\.\(\)\!,@#%<>\{\}\$\*\^]+["'])?\])?(\:(link|visited|active|hover))?([\s>+~\.,]|(?:$)))+$/,A={" ":function(a){return a&&a!==d&&a.parentNode},">":function(a,b){return a&&a.parentNode==b.parentNode&&a.parentNode},"~":function(a){return a&&a.previousSibling},"+":function(a,b,c,d){return a?(c=K(a))&&(d=K(b))&&c==d&&c:!1}};B.prototype={g:function(a){return this.c[a]||undefined},s:function(a,b){return this.c[a]=b}};var C=new B,D=new B,E=new B,F=new B,Z="compareDocumentPosition"in d?function(a,b){return(b.compareDocumentPosition(a)&16)==16}:"contains"in d?function(a,b){return b=b.nodeType===9||b==window?d:b,b!==a&&b.contains(a)}:function(a,b){while(a=a.parentNode)if(a===b)return 1;return 0},$=function(){var a=b.createElement("p");return(a.innerHTML='<a href="#x">x</a>')&&a.firstChild.getAttribute("href")!="#x"?function(a,b){return b==="class"?a.className:b==="href"||b==="src"?a.getAttribute(b,2):a.getAttribute(b)}:function(a,b){return a.getAttribute(b)}}(),_=function(){if(b[e]&&b.querySelector&&b[g])try{var a=b.createElement("p");return a.innerHTML="<a/>",a[g](":nth-of-type(1)").length}catch(c){}return!1}(),ba=function(a,b){var c=[],d,e;try{return b.nodeType===9||!o.test(a)?J(b[g](a)):(H(d=a.split(","),Y(b,function(a,b){e=a[g](b),e.length==1?c[c.length]=e.item(0):e.length&&(c=c.concat(J(e)))})),d.length>1&&c.length>1?T(c):c)}catch(f){}return bc(a,b)},bb=function(a,b){var c,d,e,f,h=[];return a=a.replace(p,"$1"),!o.test(a)&&z.test(a)?J(b[g](a)):(H(f=a.split(","),Y(b,function(a,f,i){d=z.test(f)?a[g](f):P(f,a);for(c=0,e=d.length;c<e;c++)if(a.nodeType===9||i||Z(d[c],b))h[h.length]=d[c]})),f.length>1&&h.length>1?T(h):h)},bc=function(a,b){var c=[],d,e,g,h,i,j;a=a.replace(p,"$1");if(e=a.match(m)){i=G(e[2]),d=b[f](e[1]||"*");for(g=0,h=d.length;g<h;g++)i.test(d[g].className)&&(c[c.length]=d[g]);return c}return H(j=a.split(","),Y(b,function(a,d,e){i=P(d,a);for(g=0,h=i.length;g<h;g++)if(a.nodeType===9||e||Z(i[g],b))c[c.length]=i[g]})),j.length>1&&c.length>1?T(c):c},bd=_?ba:b[g]?bb:bc;return X.uniq=T,X.is=Q,X.pseudos={},X.noConflict=function(){return a.qwery=c,this},X})
\ No newline at end of file
diff --git a/src/qwery.js b/src/qwery.js
index 801643c..0d84578 100644
--- a/src/qwery.js
+++ b/src/qwery.js
@@ -214,22 +214,21 @@
     return (cand = crawl(el, tokens.length - 1, el)) && (!root || isAncestor(cand, root))
   }
 
-  function isNode(el) {
-    return el && typeof el === 'object' && el.nodeType && (el.nodeType == 1 || el.nodeType == 9)
+  function isNode(el, t) {
+    return el && typeof el === 'object' && (t = el.nodeType) && (t == 1 || t == 9)
   }
 
   function uniq(ar) {
-    var r = [], i = 0, j = 0, k, item, inIt
-    for (; item = ar[i]; ++i) {
-      inIt = false
-      for (k = 0; k < r.length; ++k) {
-        if (r[k] === item) {
-          inIt = true; break
+    var a = [], i, j
+    o: for (i = 0; i < ar.length; ++i) {
+      for (j = 0; j < a.length; ++j) {
+        if (a[j] == ar[i]) {
+          continue o
         }
       }
-      if (!inIt) r[j++] = item
+      a[a.length] = ar[i]
     }
-    return r
+    return a
   }
 
   function arrayLike(o) {