From 8c15e852a4614ba5a5100e1c6e8a833c39b4ca79 Mon Sep 17 00:00:00 2001 From: John Resig Date: Tue, 21 Aug 2007 04:46:07 +0000 Subject: [PATCH] Two quick fixes in relation to #1028. ajaxSetup shouldn't be deep and the boolean arg should be used, not overwritten with 'true'. --- src/ajax/ajax.js | 2 +- src/jquery/jquery.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ajax/ajax.js b/src/ajax/ajax.js index d9b3a3d..6c08391 100644 --- a/src/ajax/ajax.js +++ b/src/ajax/ajax.js @@ -434,7 +434,7 @@ jQuery.extend({ * @cat Ajax */ ajaxSetup: function( settings ) { - jQuery.extend( true, jQuery.ajaxSettings, settings ); + jQuery.extend( jQuery.ajaxSettings, settings ); }, ajaxSettings: { diff --git a/src/jquery/jquery.js b/src/jquery/jquery.js index a79b2e6..1d2e197 100644 --- a/src/jquery/jquery.js +++ b/src/jquery/jquery.js @@ -1260,7 +1260,7 @@ jQuery.extend = jQuery.fn.extend = function() { // Handle a deep copy situation if ( target.constructor == Boolean ) { - deep = true; + deep = target; target = arguments[1] || {}; } -- 1.7.10.4