diff options
| author | John Resig <jeresig@gmail.com> | 2006-11-07 16:56:10 +0000 |
|---|---|---|
| committer | John Resig <jeresig@gmail.com> | 2006-11-07 16:56:10 +0000 |
| commit | ce2555ea7c265d0e08084b469d785d3d719445f6 (patch) | |
| tree | 9d268c518dda718d92234da62ca42ad82e93c6d0 | |
| parent | 83e98c28ef8aba11e525bf4266f8454232236ca0 (diff) | |
| download | jquery-ce2555ea7c265d0e08084b469d785d3d719445f6.tar.gz jquery-ce2555ea7c265d0e08084b469d785d3d719445f6.zip | |
Fixed the issue with jQuery conflicting with windows/IFrames.
| -rw-r--r-- | src/jquery/jquery.js | 2 |
1 files changed, 1 insertions, 1 deletions
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, [] ) : |