mirror of
https://github.com/jquery/jquery.git
synced 2024-11-23 02:54:22 +00:00
Two quick fixes in relation to #1028. ajaxSetup shouldn't be deep and the boolean arg should be used, not overwritten with 'true'.
This commit is contained in:
parent
e112e6b04d
commit
8c15e852a4
@ -434,7 +434,7 @@ jQuery.extend({
|
||||
* @cat Ajax
|
||||
*/
|
||||
ajaxSetup: function( settings ) {
|
||||
jQuery.extend( true, jQuery.ajaxSettings, settings );
|
||||
jQuery.extend( jQuery.ajaxSettings, settings );
|
||||
},
|
||||
|
||||
ajaxSettings: {
|
||||
|
2
src/jquery/jquery.js
vendored
2
src/jquery/jquery.js
vendored
@ -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] || {};
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user