aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorjaubourg <j@ubourg.net>2011-01-29 01:25:27 +0100
committerjaubourg <j@ubourg.net>2011-01-29 01:25:27 +0100
commitb9f2131a9da53fff60549e87428a0efe43f9e80a (patch)
tree3be6718157037b22e340dcc4278debfb5b7df66e /src
parent0a0cff9d29c4bd559da689d96c532d06c03fce09 (diff)
downloadjquery-b9f2131a9da53fff60549e87428a0efe43f9e80a.tar.gz
jquery-b9f2131a9da53fff60549e87428a0efe43f9e80a.zip
Fixes potential collisions between jsonp requests from different jQuery instances by prefixing the jsonp callback name with the jQuery expando rather than with "jsonp".
Diffstat (limited to 'src')
-rw-r--r--src/ajax/jsonp.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ajax/jsonp.js b/src/ajax/jsonp.js
index 16a4c2fd2..cbe36804b 100644
--- a/src/ajax/jsonp.js
+++ b/src/ajax/jsonp.js
@@ -7,7 +7,7 @@ var jsc = jQuery.now(),
jQuery.ajaxSetup({
jsonp: "callback",
jsonpCallback: function() {
- return "jsonp" + jsc++;
+ return jQuery.expando + "_" + ( jsc++ );
}
});