Permalink
Browse files

Merge branch 'bug_7413' of https://github.com/rwldrn/jquery into rwld…

…rn-bug_7413
  • Loading branch information...
jeresig committed Dec 9, 2010
2 parents 8943b42 + fc563cc commit fb6c038bf00296480234c971a1664ac01ca1479e
Showing with 17 additions and 4 deletions.
  1. +6 −0 src/core.js
  2. +11 −4 test/unit/core.js
@@ -532,6 +532,12 @@ jQuery.extend({
},

isEmptyObject: function( obj ) {

// Fixes #7413 Check to see if obj passes isPlainObject
if ( !jQuery.isPlainObject( obj ) ) {
return false;
}

for ( var name in obj ) {
return false;
}
@@ -848,13 +848,20 @@ test("jQuery.makeArray", function(){
});

test("jQuery.isEmptyObject", function(){
expect(2);
expect(11);

equals(true, jQuery.isEmptyObject({}), "isEmptyObject on empty object literal" );
equals(false, jQuery.isEmptyObject({a:1}), "isEmptyObject on non-empty object literal" );

// What about this ?
// equals(true, jQuery.isEmptyObject(null), "isEmptyObject on null" );
equals(false, jQuery.isEmptyObject(1), "isEmptyObject on number (wrong argument type)");
equals(false, jQuery.isEmptyObject(0), "isEmptyObject on falsy number (wrong argument type)");
equals(false, jQuery.isEmptyObject("test"), "isEmptyObject on string (wrong argument type)");
equals(false, jQuery.isEmptyObject(""), "isEmptyObject on falsy string (wrong argument type)");
equals(false, jQuery.isEmptyObject([1,2,3]), "isEmptyObject on array (wrong argument type)");
equals(false, jQuery.isEmptyObject([]), "isEmptyObject on an empty array (wrong argument type)");
equals(false, jQuery.isEmptyObject(undefined), "isEmptyObject on undefined (wrong argument type)");
equals(false, jQuery.isEmptyObject(false), "isEmptyObject on undefined (wrong argument type)");
equals(false, jQuery.isEmptyObject(null), "isEmptyObject on null (wrong argument type)" );

});

test("jQuery.proxy", function(){

0 comments on commit fb6c038

Please sign in to comment.