Make sure that jQuery works even when the individual modules are loaded separately...

[jquery.git] / src / traversing.js

diff --git a/src/traversing.js b/src/traversing.js
index 6375d9d..59110b0 100644 (file)
--- a/src/traversing.js
+++ b/src/traversing.js
@@ -1,38 +1,12 @@
+(function( jQuery ) {
+
 var runtil = /Until$/,
        rparentsprev = /^(?:parents|prevUntil|prevAll)/,
        // Note: This RegExp should be improved, or likely pulled from Sizzle
        rmultiselector = /,/,
+       isSimple = /^.[^:#\[\.,]*$/,
        slice = Array.prototype.slice;
 
-// Implement the identical functionality for filter and not
-var winnow = function( elements, qualifier, keep ) {
-       if ( jQuery.isFunction( qualifier ) ) {
-               return jQuery.grep(elements, function(elem, i) {
-                       return !!qualifier.call( elem, i, elem ) === keep;
-               });
-
-       } else if ( qualifier.nodeType ) {
-               return jQuery.grep(elements, function(elem, i) {
-                       return (elem === qualifier) === keep;
-               });
-
-       } else if ( typeof qualifier === "string" ) {
-               var filtered = jQuery.grep(elements, function(elem) {
-                       return elem.nodeType === 1;
-               });
-
-               if ( isSimple.test( qualifier ) ) {
-                       return jQuery.filter(qualifier, filtered, !keep);
-               } else {
-                       qualifier = jQuery.filter( qualifier, elements );
-               }
-       }
-
-       return jQuery.grep(elements, function(elem, i) {
-               return (jQuery.inArray( elem, qualifier ) >= 0) === keep;
-       });
-};
-
 jQuery.fn.extend({
        find: function( selector ) {
                var ret = this.pushStack( "", "find", selector ), length = 0;
@@ -68,10 +42,6 @@ jQuery.fn.extend({
                });
        },
 
-       contains: function( target ) {
-               return this.has( target ).length > 0;
-       },
-
        not: function( selector ) {
                return this.pushStack( winnow(this, selector, false), "not", selector);
        },
@@ -86,7 +56,7 @@ jQuery.fn.extend({
 
        closest: function( selectors, context ) {
                if ( jQuery.isArray( selectors ) ) {
-                       var ret = [], cur = this[0], match, matches = {}, selector;
+                       var ret = [], cur = this[0], match, matches = {}, selector, level = 1;
 
                        if ( cur && selectors.length ) {
                                for ( var i = 0, l = selectors.length; i < l; i++ ) {
@@ -104,11 +74,11 @@ jQuery.fn.extend({
                                                match = matches[selector];
 
                                                if ( match.jquery ? match.index(cur) > -1 : jQuery(cur).is(match) ) {
-                                                       ret.push({ selector: selector, elem: cur });
-                                                       delete matches[selector];
+                                                       ret.push({ selector: selector, elem: cur, level: level });
                                                }
                                        }
                                        cur = cur.parentNode;
+                                       level++;
                                }
                        }
 
@@ -118,7 +88,7 @@ jQuery.fn.extend({
                var pos = jQuery.expr.match.POS.test( selectors ) ? 
                        jQuery( selectors, context || this.context ) : null;
 
-               return this.map(function(i, cur){
+               return this.map(function( i, cur ) {
                        while ( cur && cur.ownerDocument && cur !== context ) {
                                if ( pos ? pos.index(cur) > -1 : jQuery(cur).is(selectors) ) {
                                        return cur;
@@ -150,9 +120,9 @@ jQuery.fn.extend({
                                jQuery.makeArray( selector ),
                        all = jQuery.merge( this.get(), set );
 
-               return this.pushStack( set[0] && (set[0].setInterval || set[0].nodeType === 9 || (set[0].parentNode && set[0].parentNode.nodeType !== 11)) ?
-                       jQuery.unique( all ) :
-                       all );
+               return this.pushStack( isDisconnected( set[0] ) || isDisconnected( all[0] ) ?
+                       all :
+                       jQuery.unique( all ) );
        },
 
        andSelf: function() {
@@ -160,20 +130,53 @@ jQuery.fn.extend({
        }
 });
 
+// A painfully simple check to see if an element is disconnected
+// from a document (should be improved, where feasible).
+function isDisconnected( node ) {
+       return !node || !node.parentNode || node.parentNode.nodeType === 11;
+}
+
 jQuery.each({
-       parent: function(elem){return elem.parentNode;},
-       parents: function(elem){return jQuery.dir(elem,"parentNode");},
-       parentsUntil: function(elem,i,until){return jQuery.dir(elem,"parentNode",until);},
-       next: function(elem){return jQuery.nth(elem,2,"nextSibling");},
-       prev: function(elem){return jQuery.nth(elem,2,"previousSibling");},
-       nextAll: function(elem){return jQuery.dir(elem,"nextSibling");},
-       prevAll: function(elem){return jQuery.dir(elem,"previousSibling");},
-       nextUntil: function(elem,i,until){return jQuery.dir(elem,"nextSibling",until);},
-       prevUntil: function(elem,i,until){return jQuery.dir(elem,"previousSibling",until);},
-       siblings: function(elem){return jQuery.sibling(elem.parentNode.firstChild,elem);},
-       children: function(elem){return jQuery.sibling(elem.firstChild);},
-       contents: function(elem){return jQuery.nodeName(elem,"iframe")?elem.contentDocument||elem.contentWindow.document:jQuery.makeArray(elem.childNodes);}
-}, function(name, fn){
+       parent: function( elem ) {
+               var parent = elem.parentNode;
+               return parent && parent.nodeType !== 11 ? parent : null;
+       },
+       parents: function( elem ) {
+               return jQuery.dir( elem, "parentNode" );
+       },
+       parentsUntil: function( elem, i, until ) {
+               return jQuery.dir( elem, "parentNode", until );
+       },
+       next: function( elem ) {
+               return jQuery.nth( elem, 2, "nextSibling" );
+       },
+       prev: function( elem ) {
+               return jQuery.nth( elem, 2, "previousSibling" );
+       },
+       nextAll: function( elem ) {
+               return jQuery.dir( elem, "nextSibling" );
+       },
+       prevAll: function( elem ) {
+               return jQuery.dir( elem, "previousSibling" );
+       },
+       nextUntil: function( elem, i, until ) {
+               return jQuery.dir( elem, "nextSibling", until );
+       },
+       prevUntil: function( elem, i, until ) {
+               return jQuery.dir( elem, "previousSibling", until );
+       },
+       siblings: function( elem ) {
+               return jQuery.sibling( elem.parentNode.firstChild, elem );
+       },
+       children: function( elem ) {
+               return jQuery.sibling( elem.firstChild );
+       },
+       contents: function( elem ) {
+               return jQuery.nodeName( elem, "iframe" ) ?
+                       elem.contentDocument || elem.contentWindow.document :
+                       jQuery.makeArray( elem.childNodes );
+       }
+}, function( name, fn ) {
        jQuery.fn[ name ] = function( until, selector ) {
                var ret = jQuery.map( this, fn, until );
                
@@ -206,7 +209,7 @@ jQuery.extend({
        
        dir: function( elem, dir, until ) {
                var matched = [], cur = elem[dir];
-               while ( cur && cur.nodeType !== 9 && (until === undefined || !jQuery( cur ).is( until )) ) {
+               while ( cur && cur.nodeType !== 9 && (until === undefined || cur.nodeType !== 1 || !jQuery( cur ).is( until )) ) {
                        if ( cur.nodeType === 1 ) {
                                matched.push( cur );
                        }
@@ -240,3 +243,35 @@ jQuery.extend({
                return r;
        }
 });
+
+// Implement the identical functionality for filter and not
+function winnow( elements, qualifier, keep ) {
+       if ( jQuery.isFunction( qualifier ) ) {
+               return jQuery.grep(elements, function( elem, i ) {
+                       var retVal = !!qualifier.call( elem, i, elem );
+                       return retVal === keep;
+               });
+
+       } else if ( qualifier.nodeType ) {
+               return jQuery.grep(elements, function( elem, i ) {
+                       return (elem === qualifier) === keep;
+               });
+
+       } else if ( typeof qualifier === "string" ) {
+               var filtered = jQuery.grep(elements, function( elem ) {
+                       return elem.nodeType === 1;
+               });
+
+               if ( isSimple.test( qualifier ) ) {
+                       return jQuery.filter(qualifier, filtered, !keep);
+               } else {
+                       qualifier = jQuery.filter( qualifier, filtered );
+               }
+       }
+
+       return jQuery.grep(elements, function( elem, i ) {
+               return (jQuery.inArray( elem, qualifier ) >= 0) === keep;
+       });
+}
+
+})( jQuery );