git.asbjorn.biz
/
jquery.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Capitalized Deferred & _Deferred to clearly mark them as new types, like Event.
[jquery.git]
/
src
/
xhr.js
diff --git
a/src/xhr.js
b/src/xhr.js
index
1993e0b
..
45e9aa7
100644
(file)
--- a/
src/xhr.js
+++ b/
src/xhr.js
@@
-23,8
+23,8
@@
jQuery.xhr = function( _native ) {
if ( force || internal ) {
// Reset callbacks lists
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;
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 =
} 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" ) {
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 ) );
}
if ( oneConv || conv1 && conv2 ) {
response = oneConv ? conv1( response ) : conv2( conv1( response ) );