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

Add some tests for jQuery.isWindow and make sure that we're operating against an object before testing.

Browse source
This commit is contained in:
jeresig 2010-09-22 16:50:38 -04:00
parent c8dd49f756
commit d7a6e75241
2 changed files with 20 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/core.js
View file

@ -476,7 +476,7 @@ jQuery.extend({
// A crude way of determining if an object is a window
isWindow: function( obj ) {
return "setInterval" in obj;
return obj && typeof obj === "object" && "setInterval" in obj;
},
type: function( obj ) {

19
test/unit/core.js
View file

@ -432,6 +432,25 @@ test("isXMLDoc - XML", function() {
});
}
test("isWindow", function() {
expect( 12 );
ok( jQuery.isWindow(window), "window" );
ok( !jQuery.isWindow(), "empty" );
ok( !jQuery.isWindow(null), "null" );
ok( !jQuery.isWindow(undefined), "undefined" );
ok( !jQuery.isWindow(document), "document" );
ok( !jQuery.isWindow(document.documentElement), "documentElement" );
ok( !jQuery.isWindow(""), "string" );
ok( !jQuery.isWindow(1), "number" );
ok( !jQuery.isWindow(true), "boolean" );
ok( !jQuery.isWindow({}), "object" );
// HMMM
// ok( !jQuery.isWindow({ setInterval: function(){} }), "fake window" );
ok( !jQuery.isWindow(/window/), "regexp" );
ok( !jQuery.isWindow(function(){}), "function" );
});
test("jQuery('html')", function() {
expect(15);