From: Colin Snover Date: Mon, 7 Feb 2011 16:52:33 +0000 (-0600) Subject: Merge branch 'master' of github.com:jquery/jquery into jquery-master X-Git-Url: http://git.asbjorn.it/?p=jquery.git;a=commitdiff_plain;h=8805f1373d321d7e80e1984bd7e9a3e5d8e50943;hp=7acb141ed7f2dedd950bb65acf878098640d081e Merge branch 'master' of github.com:jquery/jquery into jquery-master --- diff --git a/src/ajax.js b/src/ajax.js index 2b6b80f..76f9834 100644 --- a/src/ajax.js +++ b/src/ajax.js @@ -365,9 +365,10 @@ jQuery.extend({ ( s.context = ( "context" in options ? options : jQuery.ajaxSettings ).context ) || s, // Context for global events // It's the callbackContext if one was provided in the options - // and if it's a DOM node - globalEventContext = callbackContext !== s && callbackContext.nodeType ? - jQuery( callbackContext ) : jQuery.event, + // and if it's a DOM node or a jQuery collection + globalEventContext = callbackContext !== s && + ( callbackContext.nodeType || callbackContext instanceof jQuery ) ? + jQuery( callbackContext ) : jQuery.event, // Deferreds deferred = jQuery.Deferred(), completeDeferred = jQuery._Deferred(),