X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fxhr.js;h=45e9aa7257b979012bda28e34e8d0696e1d9f32f;hb=1e1a9c7eb055511dce74e4b5f807b93d5a76bbd6;hp=1993e0b5d1fe4fb19c60483f5c504af157f4d269;hpb=1db2f02cc78b10bd638d70457645e1daa5c01344;p=jquery.git

diff --git a/src/xhr.js b/src/xhr.js
index 1993e0b..45e9aa7 100644
--- a/src/xhr.js
+++ b/src/xhr.js
@@ -23,8 +23,8 @@ jQuery.xhr = function( _native ) {
 		if ( force || internal ) {
 			
 			// Reset callbacks lists
-			deferred = jQuery.deferred();
-			completeDeferred = jQuery._deferred();
+			deferred = jQuery.Deferred();
+			completeDeferred = jQuery._Deferred();
 			
 			xhr.success = xhr.then = deferred.then;
 			xhr.error = xhr.fail = deferred.fail;
@@ -254,12 +254,14 @@ jQuery.xhr = function( _native ) {
 							} else if ( current !== "*" && prev !== current ) {
 							
 								oneConv = conv1 = 
-									dataConverters[ ( conversion = prev + " => " + current ) ] ||
-									dataConverters[ "* => " + current ];
+									dataConverters[ ( conversion = prev + " " + current ) ] ||
+									dataConverters[ "* " + current ];
+								
+								console.log( conversion );
 								
 								if ( ! oneConv && prev !== "text" && current !== "text" ) {
-									conv1 = dataConverters[ prev + " => text" ] || dataConverters[ "* => text" ];
-									conv2 = dataConverters[ "text => " + current ];
+									conv1 = dataConverters[ prev + " text" ] || dataConverters[ "* text" ];
+									conv2 = dataConverters[ "text " + current ];
 								}
 								if ( oneConv || conv1 && conv2 ) {
 									response = oneConv ? conv1( response ) : conv2( conv1( response ) );