Skip to content
Permalink
Browse files

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

  • Loading branch information
csnover committed Feb 7, 2011
2 parents 7acb141 + 5b421fe commit 8805f1373d321d7e80e1984bd7e9a3e5d8e50943
Showing with 4 additions and 3 deletions.
  1. +4 −3 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(),

0 comments on commit 8805f13

Please sign in to comment.
You can’t perform that action at this time.