X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fajax.js;h=4af502a9780b510b66b665973d06905e232648b6;hb=1a14a38ff77839b2a71fbc3f3c0890ebe62438c7;hp=ee52ed82f5e75bcb9161aa4a02fc2203daa59271;hpb=f91b944cabf7be9aadb40ffe35fce76b50f5f25f;p=jquery.git

diff --git a/src/ajax.js b/src/ajax.js
index ee52ed8..4af502a 100644
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -206,7 +206,7 @@ jQuery.extend({
 		var s = jQuery.extend(true, {}, jQuery.ajaxSettings, origSettings);
 		
 		var jsonp, status, data,
-			callbackContext = s.context || s,
+			callbackContext = origSettings && origSettings.context || s,
 			type = s.type.toUpperCase();
 
 		// convert data if not already a string