Merge branch 'master' of github.com:jquery/jquery into deferred

[jquery.git] / src / ajax.js

diff --git a/src/ajax.js b/src/ajax.js
index 9f8e238..6cb2a62 100644 (file)
--- 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