git.asbjorn.biz
/
jquery.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7862c45
)
Use origSettings.context unless it's undefined; for that case use merged settings...
author
Dave Methvin
<dave.methvin@gmail.com>
Fri, 24 Sep 2010 21:04:54 +0000
(17:04 -0400)
committer
jeresig
<jeresig@gmail.com>
Fri, 24 Sep 2010 21:04:54 +0000
(17:04 -0400)
src/ajax.js
patch
|
blob
|
history
diff --git
a/src/ajax.js
b/src/ajax.js
index
a9e13a8
..
5d93af6
100644
(file)
--- a/
src/ajax.js
+++ b/
src/ajax.js
@@
-207,7
+207,9
@@
jQuery.extend({
jsonp, status, data, type = s.type.toUpperCase();
s.url = s.url.replace( rhash, "" );
- s.context = origSettings && origSettings.context || s;
+
+ // Use original (not extended) context object if it was provided
+ s.context = origSettings && origSettings.context != null ? origSettings.context : s;
// convert data if not already a string
if ( s.data && s.processData && typeof s.data !== "string" ) {