From: jaubourg <j@ubourg.net>
Date: Sat, 29 Jan 2011 00:25:27 +0000 (+0100)
Subject: Fixes potential collisions between jsonp requests from different jQuery instances... 
X-Git-Tag: 1.5~7
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=b9f2131a9da53fff60549e87428a0efe43f9e80a;p=jquery.git

Fixes potential collisions between jsonp requests from different jQuery instances by prefixing the jsonp callback name with the jQuery expando rather than with "jsonp".
---

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++ );
 	}
 });