diff options
| author | John Resig <jeresig@gmail.com> | 2007-08-21 04:42:31 +0000 |
|---|---|---|
| committer | John Resig <jeresig@gmail.com> | 2007-08-21 04:42:31 +0000 |
| commit | e112e6b04d1736d3a847d44b96f7178175e17a15 (patch) | |
| tree | 8002efee55d2a982fc9f262a8ba3e01b6ebe589d /src/ajax | |
| parent | 8cf5d2df19d918bb84f4c59bc4346c215fbfaf88 (diff) | |
| download | jquery-e112e6b04d1736d3a847d44b96f7178175e17a15.tar.gz jquery-e112e6b04d1736d3a847d44b96f7178175e17a15.zip | |
Make deep .extend() an optional argument - it will go deep if you pass in an boolean as the first argument (fixed bug #1028).
Diffstat (limited to 'src/ajax')
| -rw-r--r-- | src/ajax/ajax.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/ajax/ajax.js b/src/ajax/ajax.js index 4f0b2e8fd..d9b3a3d8b 100644 --- a/src/ajax/ajax.js +++ b/src/ajax/ajax.js @@ -434,7 +434,7 @@ jQuery.extend({ * @cat Ajax */ ajaxSetup: function( settings ) { - jQuery.extend( jQuery.ajaxSettings, settings ); + jQuery.extend( true, jQuery.ajaxSettings, settings ); }, ajaxSettings: { @@ -575,7 +575,7 @@ jQuery.extend({ ajax: function( s ) { // Extend the settings, but re-extend 's' so that it can be // checked again later (in the test suite, specifically) - s = jQuery.extend(s, jQuery.extend({}, jQuery.ajaxSettings, s)); + s = jQuery.extend(true, s, jQuery.extend(true, {}, jQuery.ajaxSettings, s)); // if data available if ( s.data ) { |