Skip to content
Permalink
Browse files
Two quick fixes in relation to #1028. ajaxSetup shouldn't be deep and…
… the boolean arg should be used, not overwritten with 'true'.
  • Loading branch information
jeresig committed Aug 21, 2007
1 parent e112e6b commit 8c15e852a4614ba5a5100e1c6e8a833c39b4ca79
Showing with 2 additions and 2 deletions.
  1. +1 −1 src/ajax/ajax.js
  2. +1 −1 src/jquery/jquery.js
@@ -434,7 +434,7 @@ jQuery.extend({
* @cat Ajax
*/
ajaxSetup: function( settings ) {
jQuery.extend( true, jQuery.ajaxSettings, settings );
jQuery.extend( jQuery.ajaxSettings, settings );
},

ajaxSettings: {
@@ -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] || {};
}

0 comments on commit 8c15e85

Please sign in to comment.