More code style fixes.
This commit is contained in:
parent
dd5bf42122
commit
ee22c8b34b
3 changed files with 10 additions and 11 deletions
14
src/ajax.js
14
src/ajax.js
|
@ -255,7 +255,7 @@ jQuery.extend({
|
||||||
|
|
||||||
// If options is not an object,
|
// If options is not an object,
|
||||||
// we simulate pre-1.5 signature
|
// we simulate pre-1.5 signature
|
||||||
if ( typeof( options ) !== "object" ) {
|
if ( typeof options !== "object" ) {
|
||||||
options = url;
|
options = url;
|
||||||
url = undefined;
|
url = undefined;
|
||||||
}
|
}
|
||||||
|
@ -423,7 +423,7 @@ jQuery.extend({
|
||||||
statusCode = undefined;
|
statusCode = undefined;
|
||||||
|
|
||||||
if ( s.global ) {
|
if ( s.global ) {
|
||||||
globalEventContext.trigger( "ajax" + ( isSuccess ? "Success" : "Error" ) ,
|
globalEventContext.trigger( "ajax" + ( isSuccess ? "Success" : "Error" ),
|
||||||
[ jXHR, s, isSuccess ? success : error ] );
|
[ jXHR, s, isSuccess ? success : error ] );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -455,7 +455,7 @@ jQuery.extend({
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
tmp = map[ jXHR.status ];
|
tmp = map[ jXHR.status ];
|
||||||
jXHR.then( tmp , tmp );
|
jXHR.then( tmp, tmp );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return this;
|
return this;
|
||||||
|
@ -702,7 +702,7 @@ function inspectPrefiltersOrTransports( structure, options, originalOptions, dat
|
||||||
selected = list[ i ]( options, originalOptions );
|
selected = list[ i ]( options, originalOptions );
|
||||||
// If we got redirected to a different dataType,
|
// If we got redirected to a different dataType,
|
||||||
// we add it and switch to the corresponding list
|
// we add it and switch to the corresponding list
|
||||||
if ( typeof( selected ) === "string" && selected !== dataType ) {
|
if ( typeof selected === "string" && selected !== dataType ) {
|
||||||
options.dataTypes.unshift( selected );
|
options.dataTypes.unshift( selected );
|
||||||
selected = inspectPrefiltersOrTransports(
|
selected = inspectPrefiltersOrTransports(
|
||||||
structure, options, originalOptions, selected, tested );
|
structure, options, originalOptions, selected, tested );
|
||||||
|
@ -757,7 +757,7 @@ function prefiltersOrTransports( structure, arg1, arg2, type /* internal */ ) {
|
||||||
return inspectPrefiltersOrTransports( structure, arg1, arg2 );
|
return inspectPrefiltersOrTransports( structure, arg1, arg2 );
|
||||||
} else {
|
} else {
|
||||||
// We're requested to add to the structure
|
// We're requested to add to the structure
|
||||||
// Signature is ( dataTypeExpression , function )
|
// Signature is ( dataTypeExpression, function )
|
||||||
// with dataTypeExpression being optional and
|
// with dataTypeExpression being optional and
|
||||||
// defaulting to auto ("*")
|
// defaulting to auto ("*")
|
||||||
type = ( type === "function" );
|
type = ( type === "function" );
|
||||||
|
@ -818,11 +818,11 @@ function ajaxHandleResponses( s, jXHR, responses ) {
|
||||||
} else {
|
} else {
|
||||||
// Try convertible dataTypes
|
// Try convertible dataTypes
|
||||||
for ( type in responses ) {
|
for ( type in responses ) {
|
||||||
if ( ! dataTypes[ 0 ] || s.converters[ type + " " + dataTypes[0] ] ) {
|
if ( !dataTypes[ 0 ] || s.converters[ type + " " + dataTypes[0] ] ) {
|
||||||
finalDataType = type;
|
finalDataType = type;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
if ( ! firstDataType ) {
|
if ( !firstDataType ) {
|
||||||
firstDataType = type;
|
firstDataType = type;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -12,10 +12,9 @@ jQuery.ajaxSetup({
|
||||||
});
|
});
|
||||||
|
|
||||||
// Detect, normalize options and install callbacks for jsonp requests
|
// Detect, normalize options and install callbacks for jsonp requests
|
||||||
// (dataIsString is used internally)
|
jQuery.ajaxPrefilter( "json jsonp", function( s, originalSettings, dataIsString /* internal */ ) {
|
||||||
jQuery.ajaxPrefilter( "json jsonp", function( s, originalSettings, dataIsString ) {
|
|
||||||
|
|
||||||
dataIsString = ( typeof( s.data ) === "string" );
|
dataIsString = ( typeof s.data === "string" );
|
||||||
|
|
||||||
if ( s.dataTypes[ 0 ] === "jsonp" ||
|
if ( s.dataTypes[ 0 ] === "jsonp" ||
|
||||||
originalSettings.jsonpCallback ||
|
originalSettings.jsonpCallback ||
|
||||||
|
|
|
@ -14,7 +14,7 @@ jQuery.ajaxSetup({
|
||||||
});
|
});
|
||||||
|
|
||||||
// Handle cache's special case and global
|
// Handle cache's special case and global
|
||||||
jQuery.ajaxPrefilter( "script", function(s) {
|
jQuery.ajaxPrefilter( "script", function( s ) {
|
||||||
if ( s.cache === undefined ) {
|
if ( s.cache === undefined ) {
|
||||||
s.cache = false;
|
s.cache = false;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue