X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;ds=inline;f=src%2Fajax.js;h=6cb2a626d848519ec6cc4f2ddd7dc456460d0edc;hb=97b32d78307273f8bd2e5147bf5c0f0a45607a95;hp=9f8e2384eeab0f260b9a209ae37193a6cb0854da;hpb=f7ed2aca562620f9424b1667170352e798e99ef3;p=jquery.git diff --git a/src/ajax.js b/src/ajax.js index 9f8e238..6cb2a62 100644 --- a/src/ajax.js +++ b/src/ajax.js @@ -121,9 +121,8 @@ jQuery.each( "ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".sp }; }); -jQuery.extend({ - - get: function( url, data, callback, type ) { +jQuery.each( [ "get", "post" ], function( i, method ) { + jQuery[ method ] = function( url, data, callback, type ) { // shift arguments if data argument was omited if ( jQuery.isFunction( data ) ) { type = type || callback; @@ -132,13 +131,16 @@ jQuery.extend({ } return jQuery.ajax({ - type: "GET", + type: method, url: url, data: data, success: callback, dataType: type }); - }, + }; +}); + +jQuery.extend({ getScript: function( url, callback ) { return jQuery.get(url, null, callback, "script"); @@ -148,23 +150,6 @@ jQuery.extend({ return jQuery.get(url, data, callback, "json"); }, - post: function( url, data, callback, type ) { - // shift arguments if data argument was omited - if ( jQuery.isFunction( data ) ) { - type = type || callback; - callback = data; - data = {}; - } - - return jQuery.ajax({ - type: "POST", - url: url, - data: data, - success: callback, - dataType: type - }); - }, - ajaxSetup: function( settings ) { jQuery.extend( jQuery.ajaxSettings, settings ); }, @@ -430,6 +415,8 @@ jQuery.extend({ if ( i ) { + prev = dataTypes[ i - 1 ]; + if ( prev !== "*" && current !== "*" && prev !== current ) { oneConv = conv1 = @@ -455,8 +442,6 @@ jQuery.extend({ response = s.dataFilter( response ); dataTypes = s.dataTypes; } - - prev = current; } // We have a real success