library-mirrors/jquery
1
0
Fork 0
mirror of https://github.com/jquery/jquery.git synced 2024-10-05 11:34:18 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Two quick fixes in relation to #1028. ajaxSetup shouldn't be deep and the boolean arg should be used, not overwritten with 'true'.

Browse Source
This commit is contained in:
John Resig 2007-08-21 04:46:07 +00:00
parent e112e6b04d
commit 8c15e852a4
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ajax/ajax.js
View File

@ -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: {

2
src/jquery/jquery.js vendored
View File

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