X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fajax%2Fajax.js;h=0b2786a06500aa734db5dd6a105d8c44d6280069;hb=4df20c0c1b8506981087dd8702f3a076bd57d017;hp=d9b3a3d8b4d01d808cac67a9a6d81026606610e3;hpb=e112e6b04d1736d3a847d44b96f7178175e17a15;p=jquery.git

diff --git a/src/ajax/ajax.js b/src/ajax/ajax.js
index d9b3a3d..0b2786a 100644
--- a/src/ajax/ajax.js
+++ b/src/ajax/ajax.js
@@ -109,7 +109,12 @@ jQuery.fn.extend({
 	 */
 	serialize: function() {
 		return jQuery.param( this );
-	}
+	},
+
+	// DEPRECATED
+	// This method no longer does anything - all script evaluation is
+	// taken care of within the HTML injection methods.
+	evalScripts: function(){}
 
 });
 
@@ -434,7 +439,7 @@ jQuery.extend({
 	 * @cat Ajax
 	 */
 	ajaxSetup: function( settings ) {
-		jQuery.extend( true, jQuery.ajaxSettings, settings );
+		jQuery.extend( jQuery.ajaxSettings, settings );
 	},
 
 	ajaxSettings: {