X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fajax%2Fajax.js;h=dd54d0c30f7c455399ee2731f5c816312848e40a;hb=53dc6afc310aa0e5df094304996ef605d4dbbd58;hp=62785f355c9320ab652f3464f2c4532b7fbb0bfe;hpb=139393fe0978e79c427ad13f1a03a10431ef95e5;p=jquery.git diff --git a/src/ajax/ajax.js b/src/ajax/ajax.js index 62785f3..dd54d0c 100644 --- a/src/ajax/ajax.js +++ b/src/ajax/ajax.js @@ -1,10 +1,5 @@ jQuery.fn.extend({ - // DEPRECATED - loadIfModified: function( url, params, callback ) { - this.load( url, params, callback, 1 ); - }, - - load: function( url, params, callback, ifModified ) { + load: function( url, params, callback ) { if ( jQuery.isFunction( url ) ) return this.bind("load", url); @@ -40,10 +35,9 @@ jQuery.fn.extend({ url: url, type: type, data: params, - ifModified: ifModified, complete: function(res, status){ // If successful, inject the HTML into all the matched elements - if ( status == "success" || !ifModified && status == "notmodified" ) + if ( status == "success" || status == "notmodified" ) // See if a selector was specified self.html( selector ? // Create a dummy div to hold the results @@ -69,12 +63,7 @@ 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(){} + } }); @@ -88,7 +77,7 @@ jQuery.each( "ajaxStart,ajaxStop,ajaxComplete,ajaxError,ajaxSuccess,ajaxSend".sp var jsc = (new Date).getTime(); jQuery.extend({ - get: function( url, data, callback, type, ifModified ) { + get: function( url, data, callback, type ) { // shift arguments if data argument was ommited if ( jQuery.isFunction( data ) ) { callback = data; @@ -100,16 +89,10 @@ jQuery.extend({ url: url, data: data, success: callback, - dataType: type, - ifModified: ifModified + dataType: type }); }, - // DEPRECATED - getIfModified: function( url, data, callback, type ) { - return jQuery.get(url, data, callback, type, 1); - }, - getScript: function( url, callback ) { return jQuery.get(url, null, callback, "script"); }, @@ -133,11 +116,6 @@ jQuery.extend({ }); }, - // DEPRECATED - ajaxTimeout: function( timeout ) { - jQuery.ajaxSettings.timeout = timeout; - }, - ajaxSetup: function( settings ) { jQuery.extend( jQuery.ajaxSettings, settings ); },