X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=src%2Fajax%2Fajax.js;h=ccf4f14a95f89048b842a048b5b5984a8433e95b;hb=0477a6e99e95ae93da983e7fc2a30bf16ea8ca77;hp=d9b3a3d8b4d01d808cac67a9a6d81026606610e3;hpb=e112e6b04d1736d3a847d44b96f7178175e17a15;p=jquery.git

diff --git a/src/ajax/ajax.js b/src/ajax/ajax.js
index d9b3a3d..ccf4f14 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 );
 	},
@@ -47,6 +48,12 @@ jQuery.fn.extend({
 		if ( jQuery.isFunction( url ) )
 			return this.bind("load", url);
 
+		var off = url.indexOf(" ");
+		if ( off >= 0 ) {
+			var selector = url.slice(off, url.length);
+			url = url.slice(0, off);
+		}
+
 		callback = callback || function(){};
 
 		// Default to a GET request
@@ -77,7 +84,19 @@ jQuery.fn.extend({
 			complete: function(res, status){
 				// If successful, inject the HTML into all the matched elements
 				if ( status == "success" || !ifModified && status == "notmodified" )
-					self.html(res.responseText);
+					// See if a selector was specified
+					self.html( selector ?
+						// Create a dummy div to hold the results
+						jQuery("<div/>")
+							// inject the contents of the document in, removing the scripts
+							// to avoid any 'Permission Denied' errors in IE
+							.append(res.responseText.replace(/<script(.|\s)*?\/script>/g, ""))
+
+							// Locate the specified elements
+							.find(selector) :
+
+						// If not, just inject the full result
+						res.responseText );
 
 				// Add delay to account for Safari's delay in globalEval
 				setTimeout(function(){
@@ -109,7 +128,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 +321,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 +434,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;
 	},
@@ -434,7 +460,7 @@ jQuery.extend({
 	 * @cat Ajax
 	 */
 	ajaxSetup: function( settings ) {
-		jQuery.extend( true, jQuery.ajaxSettings, settings );
+		jQuery.extend( jQuery.ajaxSettings, settings );
 	},
 
 	ajaxSettings: {