Skip to content
Permalink
Browse files

Back out one of the changes from the previous commit that wasn't nece…

…ssary to fix the bug and might not be desired.
  • Loading branch information
davids549 committed Nov 28, 2007
1 parent 95c0265 commit b6d70a7ce3795e8c1306a513b89a31de0c5f0a13
Showing with 2 additions and 2 deletions.
  1. +1 −1 src/core.js
  2. +1 −1 test/unit/core.js
@@ -553,7 +553,7 @@ jQuery.extend = jQuery.fn.extend = function() {
target[ name ] = jQuery.extend( target[ name ], options[ name ] );

// Don't bring in undefined values
else if ( options[ name ] !== undefined )
else if ( options[ name ] != undefined )
target[ name ] = options[ name ];

}
@@ -874,7 +874,7 @@ test("$.extend(Object, Object)", function() {
ok( typeof ret.foo != "string", "Check to make sure values equal with coersion (but not actually equal) overwrite correctly" );

var ret = jQuery.extend(true, { foo:"bar" }, { foo:null } );
equals( ret.foo, null, "Check to make sure values equal with coersion (but not actually equal) overwrite correctly" );
ok( typeof ret.foo !== 'undefined', "Make sure a null value doesn't crash with deep extend, for #1908" );

var defaults = { xnumber1: 5, xnumber2: 7, xstring1: "peter", xstring2: "pan" },
defaultsCopy = { xnumber1: 5, xnumber2: 7, xstring1: "peter", xstring2: "pan" },

0 comments on commit b6d70a7

Please sign in to comment.
You can’t perform that action at this time.