From: John Resig <jeresig@gmail.com>
Date: Tue, 7 Nov 2006 16:56:10 +0000 (+0000)
Subject: Fixed the issue with jQuery conflicting with windows/IFrames.
X-Git-Tag: 1.0.4~54
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=ce2555ea7c265d0e08084b469d785d3d719445f6;p=jquery.git

Fixed the issue with jQuery conflicting with windows/IFrames.
---

diff --git a/src/jquery/jquery.js b/src/jquery/jquery.js
index 567e6a0fa..93ebe2009 100644
--- a/src/jquery/jquery.js
+++ b/src/jquery/jquery.js
@@ -56,7 +56,7 @@ var jQuery = function(a,c) {
 	}
 
 	// Watch for when an array is passed in
-	this.get( a.constructor == Array || a.length && !a.nodeType && a[0] != undefined && a[0].nodeType ?
+	this.get( a.constructor == Array || a.length && a != window && !a.nodeType && a[0] != undefined && a[0].nodeType ?
 		// Assume that it is an array of DOM Elements
 		jQuery.merge( a, [] ) :