mirror of
https://github.com/jquery/jquery.git
synced 2024-10-05 11:34:18 +00:00
Revised how context is determined and removed unnecessary "parameter as variable" trick.
This commit is contained in:
parent
92c3d87a9c
commit
bd6eb849ee
22
src/ajax.js
22
src/ajax.js
@ -233,8 +233,7 @@ jQuery.extend({
|
|||||||
},
|
},
|
||||||
|
|
||||||
// Main method
|
// Main method
|
||||||
// (s is used internally)
|
ajax: function( url , options ) {
|
||||||
ajax: function( url , options , s ) {
|
|
||||||
|
|
||||||
// Handle varargs
|
// Handle varargs
|
||||||
if ( arguments.length === 1 ) {
|
if ( arguments.length === 1 ) {
|
||||||
@ -248,19 +247,14 @@ jQuery.extend({
|
|||||||
// Get the url if provided separately
|
// Get the url if provided separately
|
||||||
options.url = url || options.url;
|
options.url = url || options.url;
|
||||||
|
|
||||||
// Create the final options object
|
var // Create the final options object
|
||||||
s = jQuery.extend( true , {} , jQuery.ajaxSettings , options );
|
s = jQuery.extend( true , {} , jQuery.ajaxSettings , options ),
|
||||||
|
// jQuery lists
|
||||||
// We force the original context
|
|
||||||
// (plain objects used as context get extended)
|
|
||||||
s.context = options.context;
|
|
||||||
|
|
||||||
var // jQuery lists
|
|
||||||
jQuery_lastModified = jQuery.lastModified,
|
jQuery_lastModified = jQuery.lastModified,
|
||||||
jQuery_etag = jQuery.etag,
|
jQuery_etag = jQuery.etag,
|
||||||
// Callbacks contexts
|
// Callbacks contexts
|
||||||
callbackContext = s.context || s,
|
callbackContext = options.context || s.context || s,
|
||||||
globalEventContext = s.context ? jQuery( s.context ) : jQuery.event,
|
globalEventContext = callbackContext === s ? jQuery.event : jQuery( callbackContext ),
|
||||||
// Deferreds
|
// Deferreds
|
||||||
deferred = jQuery.Deferred(),
|
deferred = jQuery.Deferred(),
|
||||||
completeDeferred = jQuery._Deferred(),
|
completeDeferred = jQuery._Deferred(),
|
||||||
@ -337,6 +331,10 @@ jQuery.extend({
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// We force the original context
|
||||||
|
// (plain objects used as context get extended)
|
||||||
|
s.context = options.context;
|
||||||
|
|
||||||
// Callback for when everything is done
|
// Callback for when everything is done
|
||||||
// It is defined here because jslint complains if it is declared
|
// It is defined here because jslint complains if it is declared
|
||||||
// at the end of the function (which would be more logical and readable)
|
// at the end of the function (which would be more logical and readable)
|
||||||
|
Loading…
Reference in New Issue
Block a user