git.asbjorn.biz
/
jquery.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update number of expected assertions in attribute tests
[jquery.git]
/
src
/
ajax.js
diff --git
a/src/ajax.js
b/src/ajax.js
index
95e40ec
..
a40e223
100644
(file)
--- a/
src/ajax.js
+++ b/
src/ajax.js
@@
-239,10
+239,6
@@
jQuery.extend({
var customJsonp = window[ jsonp ];
window[ jsonp ] = function( tmp ) {
var customJsonp = window[ jsonp ];
window[ jsonp ] = function( tmp ) {
- data = tmp;
- jQuery.ajax.handleSuccess( s, xhr, status, data );
- jQuery.ajax.handleComplete( s, xhr, status, data );
-
if ( jQuery.isFunction( customJsonp ) ) {
customJsonp( tmp );
if ( jQuery.isFunction( customJsonp ) ) {
customJsonp( tmp );
@@
-254,6
+250,10
@@
jQuery.extend({
delete window[ jsonp ];
} catch( jsonpError ) {}
}
delete window[ jsonp ];
} catch( jsonpError ) {}
}
+
+ data = tmp;
+ jQuery.handleSuccess( s, xhr, status, data );
+ jQuery.handleComplete( s, xhr, status, data );
if ( head ) {
head.removeChild( script );
if ( head ) {
head.removeChild( script );
@@
-281,7
+281,7
@@
jQuery.extend({
}
// Watch for a new set of requests
}
// Watch for a new set of requests
- if ( s.global && jQuery.ajax.active++ === 0 ) {
+ if ( s.global && jQuery.active++ === 0 ) {
jQuery.event.trigger( "ajaxStart" );
}
jQuery.event.trigger( "ajaxStart" );
}
@@
-308,8
+308,8
@@
jQuery.extend({
if ( !done && (!this.readyState ||
this.readyState === "loaded" || this.readyState === "complete") ) {
done = true;
if ( !done && (!this.readyState ||
this.readyState === "loaded" || this.readyState === "complete") ) {
done = true;
- jQuery.ajax.handleSuccess( s, xhr, status, data );
- jQuery.ajax.handleComplete( s, xhr, status, data );
+ jQuery.handleSuccess( s, xhr, status, data );
+ jQuery.handleComplete( s, xhr, status, data );
// Handle memory leak in IE
script.onload = script.onreadystatechange = null;
// Handle memory leak in IE
script.onload = script.onreadystatechange = null;
@@
-358,8
+358,8
@@
jQuery.extend({
xhr.setRequestHeader("If-Modified-Since", jQuery.lastModified[s.url]);
}
xhr.setRequestHeader("If-Modified-Since", jQuery.lastModified[s.url]);
}
- if ( jQuery.ajax.etag[s.url] ) {
- xhr.setRequestHeader("If-None-Match", jQuery.ajax.etag[s.url]);
+ if ( jQuery.etag[s.url] ) {
+ xhr.setRequestHeader("If-None-Match", jQuery.etag[s.url]);
}
}
}
}
@@
-378,7
+378,7
@@
jQuery.extend({
// Allow custom headers/mimetypes and early abort
if ( s.beforeSend && s.beforeSend.call(s.context, xhr, s) === false ) {
// Handle the global AJAX counter
// Allow custom headers/mimetypes and early abort
if ( s.beforeSend && s.beforeSend.call(s.context, xhr, s) === false ) {
// Handle the global AJAX counter
- if ( s.global && jQuery.ajax.active-- === 1 ) {
+ if ( s.global && jQuery.active-- === 1 ) {
jQuery.event.trigger( "ajaxStop" );
}
jQuery.event.trigger( "ajaxStop" );
}
@@
-388,7
+388,7
@@
jQuery.extend({
}
if ( s.global ) {
}
if ( s.global ) {
- jQuery.ajax.triggerGlobal( s, "ajaxSend", [xhr, s] );
+ jQuery.triggerGlobal( s, "ajaxSend", [xhr, s] );
}
// Wait for a response to come back
}
// Wait for a response to come back
@@
-398,7
+398,7
@@
jQuery.extend({
// Opera doesn't call onreadystatechange before this point
// so we simulate the call
if ( !requestDone ) {
// Opera doesn't call onreadystatechange before this point
// so we simulate the call
if ( !requestDone ) {
- jQuery.ajax.handleComplete( s, xhr, status, data );
+ jQuery.handleComplete( s, xhr, status, data );
}
requestDone = true;
}
requestDone = true;
@@
-413,9
+413,9
@@
jQuery.extend({
status = isTimeout === "timeout" ?
"timeout" :
status = isTimeout === "timeout" ?
"timeout" :
- !jQuery.ajax.httpSuccess( xhr ) ?
+ !jQuery.httpSuccess( xhr ) ?
"error" :
"error" :
- s.ifModified && jQuery.ajax.httpNotModified( xhr, s.url ) ?
+ s.ifModified && jQuery.httpNotModified( xhr, s.url ) ?
"notmodified" :
"success";
"notmodified" :
"success";
@@
-425,7
+425,7
@@
jQuery.extend({
// Watch for, and catch, XML document parse errors
try {
// process the data (runs the xml through httpData regardless of callback)
// Watch for, and catch, XML document parse errors
try {
// process the data (runs the xml through httpData regardless of callback)
- data = jQuery.ajax.httpData( xhr, s.dataType, s );
+ data = jQuery.httpData( xhr, s.dataType, s );
} catch( parserError ) {
status = "parsererror";
errMsg = parserError;
} catch( parserError ) {
status = "parsererror";
errMsg = parserError;
@@
-436,15
+436,15
@@
jQuery.extend({
if ( status === "success" || status === "notmodified" ) {
// JSONP handles its own success callback
if ( !jsonp ) {
if ( status === "success" || status === "notmodified" ) {
// JSONP handles its own success callback
if ( !jsonp ) {
- jQuery.ajax.handleSuccess( s, xhr, status, data );
+ jQuery.handleSuccess( s, xhr, status, data );
}
} else {
}
} else {
- jQuery.ajax.handleError( s, xhr, status, errMsg );
+ jQuery.handleError( s, xhr, status, errMsg );
}
// Fire the complete handlers
if ( !jsonp ) {
}
// Fire the complete handlers
if ( !jsonp ) {
- jQuery.ajax.handleComplete( s, xhr, status, data );
+ jQuery.handleComplete( s, xhr, status, data );
}
if ( isTimeout === "timeout" ) {
}
if ( isTimeout === "timeout" ) {
@@
-458,12
+458,14
@@
jQuery.extend({
}
};
}
};
- // Override the abort handler, if we can (IE doesn't allow it, but that's OK)
+ // Override the abort handler, if we can (IE 6 doesn't allow it, but that's OK)
// Opera doesn't fire onreadystatechange at all on abort
try {
var oldAbort = xhr.abort;
xhr.abort = function() {
// Opera doesn't fire onreadystatechange at all on abort
try {
var oldAbort = xhr.abort;
xhr.abort = function() {
- if ( xhr ) {
+ // xhr.abort in IE7 is not a native JS function
+ // and does not have a call property
+ if ( xhr && oldAbort.call ) {
oldAbort.call( xhr );
}
oldAbort.call( xhr );
}
@@
-486,10
+488,10
@@
jQuery.extend({
xhr.send( noContent || s.data == null ? null : s.data );
} catch( sendError ) {
xhr.send( noContent || s.data == null ? null : s.data );
} catch( sendError ) {
- jQuery.ajax.handleError( s, xhr, null, sendError );
+ jQuery.handleError( s, xhr, null, sendError );
// Fire the complete handlers
// Fire the complete handlers
- jQuery.ajax.handleComplete( s, xhr, status, data );
+ jQuery.handleComplete( s, xhr, status, data );
}
// firefox 1.5 doesn't fire statechange for sync requests
}
// firefox 1.5 doesn't fire statechange for sync requests
@@
-572,7
+574,9
@@
function buildParams( prefix, obj, traditional, add ) {
}
}
}
}
-jQuery.extend( jQuery.ajax, {
+// This is still on the jQuery object... for now
+// Want to move this to jQuery.ajax some day
+jQuery.extend({
// Counter for holding the number of active queries
active: 0,
// Counter for holding the number of active queries
active: 0,
@@
-589,7
+593,7
@@
jQuery.extend( jQuery.ajax, {
// Fire the global callback
if ( s.global ) {
// Fire the global callback
if ( s.global ) {
- jQuery.ajax.triggerGlobal( s, "ajaxError", [xhr, s, e] );
+ jQuery.triggerGlobal( s, "ajaxError", [xhr, s, e] );
}
},
}
},
@@
-601,7
+605,7
@@
jQuery.extend( jQuery.ajax, {
// Fire the global callback
if ( s.global ) {
// Fire the global callback
if ( s.global ) {
- jQuery.ajax.triggerGlobal( s, "ajaxSuccess", [xhr, s] );
+ jQuery.triggerGlobal( s, "ajaxSuccess", [xhr, s] );
}
},
}
},
@@
-613,11
+617,11
@@
jQuery.extend( jQuery.ajax, {
// The request was completed
if ( s.global ) {
// The request was completed
if ( s.global ) {
- jQuery.ajax.triggerGlobal( s, "ajaxComplete", [xhr, s] );
+ jQuery.triggerGlobal( s, "ajaxComplete", [xhr, s] );
}
// Handle the global AJAX counter
}
// Handle the global AJAX counter
- if ( s.global && jQuery.ajax.active-- === 1 ) {
+ if ( s.global && jQuery.active-- === 1 ) {
jQuery.event.trigger( "ajaxStop" );
}
},
jQuery.event.trigger( "ajaxStop" );
}
},
@@
-644,11
+648,11
@@
jQuery.extend( jQuery.ajax, {
etag = xhr.getResponseHeader("Etag");
if ( lastModified ) {
etag = xhr.getResponseHeader("Etag");
if ( lastModified ) {
- jQuery.ajax.lastModified[url] = lastModified;
+ jQuery.lastModified[url] = lastModified;
}
if ( etag ) {
}
if ( etag ) {
- jQuery.ajax.etag[url] = etag;
+ jQuery.etag[url] = etag;
}
return xhr.status === 304;
}
return xhr.status === 304;
@@
-710,7
+714,4
@@
if ( window.ActiveXObject ) {
// Does this browser support XHR requests?
jQuery.support.ajax = !!jQuery.ajaxSettings.xhr();
// Does this browser support XHR requests?
jQuery.support.ajax = !!jQuery.ajaxSettings.xhr();
-// For backwards compatibility
-jQuery.extend( jQuery.ajax );
-
})( jQuery );
})( jQuery );