git.asbjorn.biz
/
jquery.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixes abort in prefilter. No global event will be fired in that case even if the...
[jquery.git]
/
src
/
ajax
/
xhr.js
diff --git
a/src/ajax/xhr.js
b/src/ajax/xhr.js
index
d4c291f
..
91a71de
100644
(file)
--- a/
src/ajax/xhr.js
+++ b/
src/ajax/xhr.js
@@
-1,5
+1,18
@@
(function( jQuery ) {
(function( jQuery ) {
+// Functions to create xhrs
+function createStandardXHR() {
+ try {
+ return new window.XMLHttpRequest();
+ } catch( e ) {}
+}
+
+function createActiveXHR() {
+ try {
+ return new window.ActiveXObject("Microsoft.XMLHTTP");
+ } catch( e ) {}
+}
+
var // Next active xhr id
xhrId = jQuery.now(),
var // Next active xhr id
xhrId = jQuery.now(),
@@
-22,27
+35,13
@@
jQuery.ajaxSettings.xhr = window.ActiveXObject ?
* we need a fallback.
*/
function() {
* we need a fallback.
*/
function() {
- if ( !jQuery.ajaxSettings.isLocal ) {
- try {
- return new window.XMLHttpRequest();
- } catch( xhrError ) {}
- }
-
- try {
- return new window.ActiveXObject("Microsoft.XMLHTTP");
- } catch( activeError ) {}
+ return !this.isLocal && createStandardXHR() || createActiveXHR();
} :
// For all other browsers, use the standard XMLHttpRequest object
} :
// For all other browsers, use the standard XMLHttpRequest object
- function() {
- return new window.XMLHttpRequest();
- };
+ createStandardXHR;
// Test if we can create an xhr object
// Test if we can create an xhr object
-try {
- testXHR = jQuery.ajaxSettings.xhr();
-} catch( xhrCreationException ) {}
-
-//Does this browser support XHR requests?
+testXHR = jQuery.ajaxSettings.xhr();
jQuery.support.ajax = !!testXHR;
// Does this browser support crossDomain XHR requests
jQuery.support.ajax = !!testXHR;
// Does this browser support crossDomain XHR requests
@@
-85,13
+84,6
@@
if ( jQuery.support.ajax ) {
handle,
i;
handle,
i;
- // Apply custom fields if provided
- if ( s.xhrFields ) {
- for ( i in s.xhrFields ) {
- xhr[ i ] = s.xhrFields[ i ];
- }
- }
-
// Open the socket
// Passing null username, generates a login popup on Opera (#2865)
if ( s.username ) {
// Open the socket
// Passing null username, generates a login popup on Opera (#2865)
if ( s.username ) {
@@
-100,6
+92,13
@@
if ( jQuery.support.ajax ) {
xhr.open( s.type, s.url, s.async );
}
xhr.open( s.type, s.url, s.async );
}
+ // Apply custom fields if provided
+ if ( s.xhrFields ) {
+ for ( i in s.xhrFields ) {
+ xhr[ i ] = s.xhrFields[ i ];
+ }
+ }
+
// Requested-With header
// Not set for crossDomain requests with no content
// (see why at http://trac.dojotoolkit.org/ticket/9486)
// Requested-With header
// Not set for crossDomain requests with no content
// (see why at http://trac.dojotoolkit.org/ticket/9486)
@@
-189,13
+188,14
@@
if ( jQuery.support.ajax ) {
// for errors, could be anything really (even a real 0)
status = 302;
}
// for errors, could be anything really (even a real 0)
status = 302;
}
- // All same-domain - #8125, #8152: for local files, 0 is a success
+ // All same-domain: for local files, 0 is a success
} else if( s.isLocal ) {
status = 200;
} else if( s.isLocal ) {
status = 200;
+ // Opera: this notifies success for all requests
+ // (verified in 11.01). Patch welcome.
}
// Opera - #6060: sets status as 0 for 304
}
// Opera - #6060: sets status as 0 for 304
- // and there doesn't seem to be any way to
- // detect this case. Patch VERY welcome.
+ // Patch welcome.
}
}
}
}
}
}