mirror of
https://github.com/jquery/jquery.git
synced 2024-11-23 02:54:22 +00:00
Fixes #8152 by applying the same special cases for protocol "chrome-extension:" as were for "file:" (needs tests). Re-organizes and fixes the handling of special cases for HTTP status code in the xhr transport. Also re-organizes the handling of document.location in ajax.js.
This commit is contained in:
parent
5ef7ddc4c5
commit
d77a2a2274
22
src/ajax.js
22
src/ajax.js
@ -6,6 +6,8 @@ var r20 = /%20/g,
|
|||||||
rhash = /#.*$/,
|
rhash = /#.*$/,
|
||||||
rheaders = /^(.*?):\s*(.*?)\r?$/mg, // IE leaves an \r character at EOL
|
rheaders = /^(.*?):\s*(.*?)\r?$/mg, // IE leaves an \r character at EOL
|
||||||
rinput = /^(?:color|date|datetime|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,
|
rinput = /^(?:color|date|datetime|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,
|
||||||
|
// #8125, #8152: local protocol detection
|
||||||
|
rlocalProtocol = /^(file|chrome\-extension):$/,
|
||||||
rnoContent = /^(?:GET|HEAD)$/,
|
rnoContent = /^(?:GET|HEAD)$/,
|
||||||
rprotocol = /^\/\//,
|
rprotocol = /^\/\//,
|
||||||
rquery = /\?/,
|
rquery = /\?/,
|
||||||
@ -36,8 +38,11 @@ var r20 = /%20/g,
|
|||||||
*/
|
*/
|
||||||
transports = {},
|
transports = {},
|
||||||
|
|
||||||
// Stored document location array
|
// Document location
|
||||||
ajaxLocation;
|
ajaxLocation,
|
||||||
|
|
||||||
|
// Document location segments
|
||||||
|
ajaxLocParts;
|
||||||
|
|
||||||
// #8138, IE may throw an exception when accessing
|
// #8138, IE may throw an exception when accessing
|
||||||
// a field from document.location if document.domain has been set
|
// a field from document.location if document.domain has been set
|
||||||
@ -51,6 +56,9 @@ try {
|
|||||||
ajaxLocation = ajaxLocation.href;
|
ajaxLocation = ajaxLocation.href;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Segment location into parts
|
||||||
|
ajaxLocParts = rurl.exec( ajaxLocation.toLowerCase() );
|
||||||
|
|
||||||
// Base "constructor" for jQuery.ajaxPrefilter and jQuery.ajaxTransport
|
// Base "constructor" for jQuery.ajaxPrefilter and jQuery.ajaxTransport
|
||||||
function addToPrefiltersOrTransports( structure ) {
|
function addToPrefiltersOrTransports( structure ) {
|
||||||
|
|
||||||
@ -276,6 +284,7 @@ jQuery.extend({
|
|||||||
|
|
||||||
ajaxSettings: {
|
ajaxSettings: {
|
||||||
url: ajaxLocation,
|
url: ajaxLocation,
|
||||||
|
isLocal: rlocalProtocol.test( ajaxLocParts[ 1 ] ),
|
||||||
global: true,
|
global: true,
|
||||||
type: "GET",
|
type: "GET",
|
||||||
contentType: "application/x-www-form-urlencoded",
|
contentType: "application/x-www-form-urlencoded",
|
||||||
@ -562,7 +571,7 @@ jQuery.extend({
|
|||||||
// Remove hash character (#7531: and string promotion)
|
// Remove hash character (#7531: and string promotion)
|
||||||
// Add protocol if not provided (#5866: IE7 issue with protocol-less urls)
|
// Add protocol if not provided (#5866: IE7 issue with protocol-less urls)
|
||||||
// We also use the url parameter if available
|
// We also use the url parameter if available
|
||||||
s.url = ( "" + ( url || s.url ) ).replace( rhash, "" ).replace( rprotocol, ajaxLocation[ 1 ] + "//" );
|
s.url = ( "" + ( url || s.url ) ).replace( rhash, "" ).replace( rprotocol, ajaxLocParts[ 1 ] + "//" );
|
||||||
|
|
||||||
// Extract dataTypes list
|
// Extract dataTypes list
|
||||||
s.dataTypes = jQuery.trim( s.dataType || "*" ).toLowerCase().split( rspacesAjax );
|
s.dataTypes = jQuery.trim( s.dataType || "*" ).toLowerCase().split( rspacesAjax );
|
||||||
@ -571,9 +580,9 @@ jQuery.extend({
|
|||||||
if ( !s.crossDomain ) {
|
if ( !s.crossDomain ) {
|
||||||
parts = rurl.exec( s.url.toLowerCase() );
|
parts = rurl.exec( s.url.toLowerCase() );
|
||||||
s.crossDomain = !!( parts &&
|
s.crossDomain = !!( parts &&
|
||||||
( parts[ 1 ] != ajaxLocation[ 1 ] || parts[ 2 ] != ajaxLocation[ 2 ] ||
|
( parts[ 1 ] != ajaxLocParts[ 1 ] || parts[ 2 ] != ajaxLocParts[ 2 ] ||
|
||||||
( parts[ 3 ] || ( parts[ 1 ] === "http:" ? 80 : 443 ) ) !=
|
( parts[ 3 ] || ( parts[ 1 ] === "http:" ? 80 : 443 ) ) !=
|
||||||
( ajaxLocation[ 3 ] || ( ajaxLocation[ 1 ] === "http:" ? 80 : 443 ) ) )
|
( ajaxLocParts[ 3 ] || ( ajaxLocParts[ 1 ] === "http:" ? 80 : 443 ) ) )
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -730,9 +739,6 @@ jQuery.extend({
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
// Segment ajaxLocation into parts
|
|
||||||
ajaxLocation = rurl.exec( ajaxLocation.toLowerCase() );
|
|
||||||
|
|
||||||
function buildParams( prefix, obj, traditional, add ) {
|
function buildParams( prefix, obj, traditional, add ) {
|
||||||
if ( jQuery.isArray( obj ) && obj.length ) {
|
if ( jQuery.isArray( obj ) && obj.length ) {
|
||||||
// Serialize array item.
|
// Serialize array item.
|
||||||
|
@ -22,7 +22,7 @@ jQuery.ajaxSettings.xhr = window.ActiveXObject ?
|
|||||||
* we need a fallback.
|
* we need a fallback.
|
||||||
*/
|
*/
|
||||||
function() {
|
function() {
|
||||||
if ( window.location.protocol !== "file:" ) {
|
if ( !jQuery.ajaxSettings.isLocal ) {
|
||||||
try {
|
try {
|
||||||
return new window.XMLHttpRequest();
|
return new window.XMLHttpRequest();
|
||||||
} catch( xhrError ) {}
|
} catch( xhrError ) {}
|
||||||
@ -175,30 +175,28 @@ if ( jQuery.support.ajax ) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Filter status for non standard behaviors
|
// Filter status for non standard behaviors
|
||||||
status =
|
|
||||||
// Most browsers return 0 when it should be 200 for local files
|
// IE - #1450: sometimes returns 1223 when it should be 204
|
||||||
// Opera returns 0 when it should be 304
|
if ( status === 1223 ) {
|
||||||
// Webkit returns 0 for failing cross-domain no matter the real status
|
status = 204;
|
||||||
!status ?
|
// Status 0 encompasses several cases
|
||||||
// All: for local files, 0 is a success
|
} else if ( !status ) {
|
||||||
( location.protocol === "file:" ? 200 : (
|
// Cross-domain
|
||||||
// Webkit, Firefox: filter out faulty cross-domain requests
|
if ( s.crossDomain ) {
|
||||||
!s.crossDomain || statusText ?
|
if ( !s.statusText ) {
|
||||||
(
|
// FF, Webkit (other?): There is no status text for errors
|
||||||
// Opera: filter out real aborts #6060
|
// 302 is the most generic cross-domain status code
|
||||||
responseHeaders ?
|
// for errors, could be anything really (even a real 0)
|
||||||
304 :
|
status = 302;
|
||||||
0
|
}
|
||||||
) :
|
// All same-domain - #8125, #8152: for local files, 0 is a success
|
||||||
// We assume 302 but could be anything cross-domain related
|
} else if( s.isLocal ) {
|
||||||
302
|
status = 200;
|
||||||
) ) :
|
}
|
||||||
(
|
// Opera - #6060: sets status as 0 for 304
|
||||||
// IE sometimes returns 1223 when it should be 204 (see #1450)
|
// and there doesn't seem to be any way to
|
||||||
status == 1223 ?
|
// detect this case. Patch VERY welcome.
|
||||||
204 :
|
}
|
||||||
status
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} catch( firefoxAccessException ) {
|
} catch( firefoxAccessException ) {
|
||||||
|
Loading…
Reference in New Issue
Block a user