deac/jquery
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Unify the means of detecting a window across the library. Fixes jQuery UI bug #5438 and jQuery bugs #6575 and 6088.

Browse source
This commit is contained in:
jeresig 2010-09-22 16:41:51 -04:00
parent ab454d9526
commit c8dd49f756
4 changed files with 11 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/core.js
View file

@ -474,6 +474,11 @@ jQuery.extend({
return jQuery.type(obj) === "array";
},
// A crude way of determining if an object is a window
isWindow: function( obj ) {
return "setInterval" in obj;
},
type: function( obj ) {
return obj == null ?
String( obj ) :
@ -484,7 +489,7 @@ jQuery.extend({
// Must be an Object.
// Because of IE, we also have to check the presence of the constructor property.
// Make sure that DOM nodes and window objects don't pass through, as well
if ( !obj || jQuery.type(obj) !== "object" || obj.nodeType || obj.setInterval ) {
if ( !obj || jQuery.type(obj) !== "object" || obj.nodeType || jQuery.isWindow( obj ) ) {
return false;
}
@ -632,7 +637,7 @@ jQuery.extend({
// Tweaked logic slightly to handle Blackberry 4.7 RegExp issues #6930
var type = jQuery.type(array);
if ( array.length == null || type === "string" || type === "function" || type === "regexp" || "setInterval" in array ) {
if ( array.length == null || type === "string" || type === "function" || type === "regexp" || jQuery.isWindow( array ) ) {
push.call( ret, array );
} else {
jQuery.merge( ret, array );