Commit 8c15e852 authored by John Resig's avatar John Resig

Two quick fixes in relation to #1028. ajaxSetup shouldn't be deep and the...

Two quick fixes in relation to #1028. ajaxSetup shouldn't be deep and the boolean arg should be used, not overwritten with 'true'.
parent e112e6b0
...@@ -434,7 +434,7 @@ jQuery.extend({ ...@@ -434,7 +434,7 @@ jQuery.extend({
* @cat Ajax * @cat Ajax
*/ */
ajaxSetup: function( settings ) { ajaxSetup: function( settings ) {
jQuery.extend( true, jQuery.ajaxSettings, settings ); jQuery.extend( jQuery.ajaxSettings, settings );
}, },
ajaxSettings: { ajaxSettings: {
......
...@@ -1260,7 +1260,7 @@ jQuery.extend = jQuery.fn.extend = function() { ...@@ -1260,7 +1260,7 @@ jQuery.extend = jQuery.fn.extend = function() {
// Handle a deep copy situation // Handle a deep copy situation
if ( target.constructor == Boolean ) { if ( target.constructor == Boolean ) {
deep = true; deep = target;
target = arguments[1] || {}; target = arguments[1] || {};
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment