Commit b4bb6e11 authored by jeresig's avatar jeresig

Backing out fb6c038b, was causing jQuery.param...

Backing out fb6c038b, was causing jQuery.param tests to fail - unfixes #7413.
parent bc05cb9d
...@@ -532,12 +532,6 @@ jQuery.extend({ ...@@ -532,12 +532,6 @@ jQuery.extend({
}, },
isEmptyObject: function( obj ) { isEmptyObject: function( obj ) {
// Fixes #7413 Check to see if obj passes isPlainObject
if ( !jQuery.isPlainObject( obj ) ) {
return false;
}
for ( var name in obj ) { for ( var name in obj ) {
return false; return false;
} }
......
...@@ -848,20 +848,13 @@ test("jQuery.makeArray", function(){ ...@@ -848,20 +848,13 @@ test("jQuery.makeArray", function(){
}); });
test("jQuery.isEmptyObject", function(){ test("jQuery.isEmptyObject", function(){
expect(11); expect(2);
equals(true, jQuery.isEmptyObject({}), "isEmptyObject on empty object literal" ); equals(true, jQuery.isEmptyObject({}), "isEmptyObject on empty object literal" );
equals(false, jQuery.isEmptyObject({a:1}), "isEmptyObject on non-empty object literal" ); equals(false, jQuery.isEmptyObject({a:1}), "isEmptyObject on non-empty object literal" );
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)" );
// What about this ?
// equals(true, jQuery.isEmptyObject(null), "isEmptyObject on null" );
}); });
test("jQuery.proxy", function(){ test("jQuery.proxy", function(){
......
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