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

Merge branch 'master' of github.com:jquery/jquery into jquery-master

Browse source
This commit is contained in:
Colin Snover 2011-02-07 10:52:33 -06:00
parent 7acb141ed7 5b421fed00
commit 8805f1373d
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/ajax.js
View file

@ -365,9 +365,10 @@ jQuery.extend({
( s.context = ( "context" in options ? options : jQuery.ajaxSettings ).context ) || s, ( s.context = ( "context" in options ? options : jQuery.ajaxSettings ).context ) || s,
// Context for global events // Context for global events
// It's the callbackContext if one was provided in the options // It's the callbackContext if one was provided in the options
// and if it's a DOM node // and if it's a DOM node or a jQuery collection
globalEventContext = callbackContext !== s && callbackContext.nodeType ? globalEventContext = callbackContext !== s &&
jQuery( callbackContext ) : jQuery.event, ( callbackContext.nodeType || callbackContext instanceof jQuery ) ?
jQuery( callbackContext ) : jQuery.event,
// Deferreds // Deferreds
deferred = jQuery.Deferred(), deferred = jQuery.Deferred(),
completeDeferred = jQuery._Deferred(), completeDeferred = jQuery._Deferred(),