deac/jquery
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Stores jQuery.ajaxSettings.isLocal locally at load time so that any change to it won't affect the transport. Fixes the url parsing regexp to deal with empty domains. Adds informative text into test/localfile.html and handles Opera's failure. Revises the way xhr are created by doing all tests at load time and normalizes all the xhr creation functions so that none of them may throw an exception.

Browse source
This commit is contained in:
jaubourg 2011-02-03 06:12:47 +01:00
parent 50e950a96e
commit ee22a59129
3 changed files with 57 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/ajax.js
View file

@ -15,7 +15,7 @@ var r20 = /%20/g,
rselectTextarea = /^(?:select|textarea)/i,
rspacesAjax = /\s+/,
rts = /([?&])_=[^&]*/,
rurl = /^(\w+:)\/\/([^\/?#:]+)(?::(\d+))?/,
rurl = /^(\w+:)\/\/([^\/?#:]*)(?::(\d+))?/,
// Keep a copy of the old load method
_load = jQuery.fn.load,

53
src/ajax/xhr.js
View file

@ -1,5 +1,18 @@
(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(),
@ -10,7 +23,11 @@ var // Next active xhr id
xhrUnloadAbortInstalled,
// XHR used to determine supports properties
testXHR;
testXHR,
// Keep track of isLocal in case it gets removed
// from ajaxSettings later on
protocolIsLocal = jQuery.ajaxSettings.isLocal;
// Create the request object
// (This is still attached to ajaxSettings for backward compatibility)
@ -21,28 +38,17 @@ jQuery.ajaxSettings.xhr = window.ActiveXObject ?
* Additionally XMLHttpRequest can be disabled in IE7/IE8 so
* we need a fallback.
*/
function() {
if ( !jQuery.ajaxSettings.isLocal ) {
try {
return new window.XMLHttpRequest();
} catch( xhrError ) {}
( protocolIsLocal ?
createActiveXHR :
function() {
return createStandardXHR() || createActiveXHR();
}
try {
return new window.ActiveXObject("Microsoft.XMLHTTP");
} catch( activeError ) {}
} :
) :
// For all other browsers, use the standard XMLHttpRequest object
function() {
return new window.XMLHttpRequest();
};
createStandardXHR;
// 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
@ -189,13 +195,14 @@ if ( jQuery.support.ajax ) {
// for errors, could be anything really (even a real 0)
status = 302;
}
// All same-domain - #8125, #8152: for local files, 0 is a success
} else if( s.isLocal ) {
// All same-domain: for local files, 0 is a success
} else if( protocolIsLocal ) {
status = 200;
// Opera: this notifies success for all requests
// (verified in 11.01). Patch welcome.
}
// 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.
}
}
}

36
test/localfile.html
View file

@ -25,16 +25,32 @@
</head>
<body>
<h1>jQuery Local File Test</h1>
<ul>
<li>
Access this file using the "file:" protocol.
</li>
<li>
Two lines must appear below.
</li>
<li>
Opera will fail at detecting errors, it's a known issue.
</li>
</ul>
<script>
jQuery.ajax( "data/badjson.js" , {
dataType: "text"
}).success(function() {
$( "<div/>" ).text( "Success OK" ).appendTo( "body" );
});
jQuery.ajax( "data/doesnotexist.ext" , {
dataType: "text"
}).error(function() {
$( "<div/>" ).text( "Error OK" ).appendTo( "body" );
});
jQuery.ajax( "data/badjson.js" , {
dataType: "text"
}).success(function() {
jQuery( "<div/>" ).text( "Success OK" ).appendTo( "body" );
});
jQuery.ajax( "data/doesnotexist.ext" , {
dataType: "text"
}).error(function() {
jQuery( "<div/>" ).text( "Error OK" ).appendTo( "body" );
}).success(function() {
if ( jQuery.browser.opera ) {
jQuery( "<div/>" ).text( "Error Fail (Opera)" ).appendTo( "body" );
}
});
</script>
</body>