diff options
| author | John Resig <jeresig@gmail.com> | 2007-08-21 04:46:07 +0000 |
|---|---|---|
| committer | John Resig <jeresig@gmail.com> | 2007-08-21 04:46:07 +0000 |
| commit | 8c15e852a4614ba5a5100e1c6e8a833c39b4ca79 (patch) | |
| tree | fd2707b6fa9ba96148848cd319baead3ad245af4 | |
| parent | e112e6b04d1736d3a847d44b96f7178175e17a15 (diff) | |
| download | jquery-8c15e852a4614ba5a5100e1c6e8a833c39b4ca79.tar.gz jquery-8c15e852a4614ba5a5100e1c6e8a833c39b4ca79.zip | |
Two quick fixes in relation to #1028. ajaxSetup shouldn't be deep and the boolean arg should be used, not overwritten with 'true'.
| -rw-r--r-- | src/ajax/ajax.js | 2 | ||||
| -rw-r--r-- | 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 d9b3a3d8b..6c08391e0 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 a79b2e6b2..1d2e19797 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] || {}; } |