From ce2555ea7c265d0e08084b469d785d3d719445f6 Mon Sep 17 00:00:00 2001 From: John Resig Date: Tue, 7 Nov 2006 16:56:10 +0000 Subject: [PATCH] Fixed the issue with jQuery conflicting with windows/IFrames. --- src/jquery/jquery.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/jquery/jquery.js b/src/jquery/jquery.js index 567e6a0..93ebe20 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, [] ) : -- 1.7.10.4