X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fxhr.js;h=991a14501daddff1f9641a8544b34ae9da39a492;hb=fd63416ab191c9c757ba8ca155f2656fcc8ce000;hp=94c6fe165383a9250dd5430347286bf279e11134;hpb=fef0f63526df8c4e186780c742fbcd717424581b;p=jquery.git diff --git a/src/xhr.js b/src/xhr.js index 94c6fe1..991a145 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,12 @@ jQuery.xhr = function( _native ) { } else if ( current !== "*" && prev !== current ) { oneConv = conv1 = - dataConverters[ ( conversion = prev + " => " + current ) ] || - dataConverters[ "* => " + current ]; + dataConverters[ ( conversion = prev + " " + current ) ] || + dataConverters[ "* " + current ]; 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 ) );