X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=src%2Ftraversing.js;h=d0dd52db876ec4be0aef138e5bc3e88c1957d6e8;hb=5d49335eace4311de890b871e057d8b6e9122eb6;hp=a09ae19377348ad808283a85a6d78e5ffb9fd795;hpb=8e53f7b5d6716e60d8c8ea7e167f2b187aae9d89;p=jquery.git

diff --git a/src/traversing.js b/src/traversing.js
index a09ae19..d0dd52d 100644
--- a/src/traversing.js
+++ b/src/traversing.js
@@ -146,9 +146,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() {
@@ -156,6 +156,12 @@ 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 ) {
 		var parent = elem.parentNode;