X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fajax%2Fajax.js;h=aa6275410afc25647a259770bb630b1eb085574e;hb=257eaf7ee32df66ddd0a3333a5b6a829b9d388ef;hp=4f0b2e8fdd44e3abc38b3c07d19628cd620528f2;hpb=2ef4093cf7f52383dd43bd361864edcda27e5c3c;p=jquery.git

diff --git a/src/ajax/ajax.js b/src/ajax/ajax.js
index 4f0b2e8..aa62754 100644
--- a/src/ajax/ajax.js
+++ b/src/ajax/ajax.js
@@ -15,6 +15,7 @@ jQuery.fn.extend({
 	 * @param Function callback (optional) A function to be executed whenever the data is loaded (parameters: responseText, status and response itself).
 	 * @cat Ajax
 	 */
+	// DEPRECATED
 	loadIfModified: function( url, params, callback ) {
 		this.load( url, params, callback, 1 );
 	},
@@ -109,7 +110,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(){}
 
 });
 
@@ -297,6 +303,7 @@ jQuery.extend({
 	 * @param Function callback (optional) A function to be executed whenever the data is loaded successfully.
 	 * @cat Ajax
 	 */
+	// DEPRECATED
 	getIfModified: function( url, data, callback, type ) {
 		return jQuery.get(url, data, callback, type, 1);
 	},
@@ -409,6 +416,7 @@ jQuery.extend({
 	 * @param Number time How long before an AJAX request times out, in milliseconds.
 	 * @cat Ajax
 	 */
+	// DEPRECATED
 	ajaxTimeout: function( timeout ) {
 		jQuery.ajaxSettings.timeout = timeout;
 	},
@@ -575,7 +583,7 @@ jQuery.extend({
 	ajax: function( s ) {
 		// Extend the settings, but re-extend 's' so that it can be
 		// checked again later (in the test suite, specifically)
-		s = jQuery.extend(s, jQuery.extend({}, jQuery.ajaxSettings, s));
+		s = jQuery.extend(true, s, jQuery.extend(true, {}, jQuery.ajaxSettings, s));
 
 		// if data available
 		if ( s.data ) {