Skip to content

J
jquery
Commit ce2555ea authored by John Resig's avatar John Resig
Browse files
Options

Fixed the issue with jQuery conflicting with windows/IFrames.

parent 83e98c28
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
src/jquery/jquery.js
View file @ ce2555ea
...@@ -56,7 +56,7 @@ var jQuery = function(a,c) { ...@@ -56,7 +56,7 @@ var jQuery = function(a,c) {
} }
// Watch for when an array is passed in // 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 // Assume that it is an array of DOM Elements
jQuery.merge( a, [] ) : jQuery.merge( a, [] ) :
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment