Fixed the issue with jQuery conflicting with windows/IFrames.
This commit is contained in:
parent
83e98c28ef
commit
ce2555ea7c
1 changed files with 1 additions and 1 deletions
2
src/jquery/jquery.js
vendored
2
src/jquery/jquery.js
vendored
|
@ -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, [] ) :
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue