Fixes potential collisions between jsonp requests from different jQuery instances...

[jquery.git] / src / ajax / jsonp.js

diff --git a/src/ajax/jsonp.js b/src/ajax/jsonp.js
index f5742d9..cbe3680 100644 (file)
--- a/src/ajax/jsonp.js
+++ b/src/ajax/jsonp.js
@@ -1,13 +1,13 @@
 (function( jQuery ) {
 
 var jsc = jQuery.now(),
-       jsre = /(\=)(?:\?|%3F)(&|$)|()(?:\?\?|%3F%3F)()/i;
+       jsre = /(\=)\?(&|$)|()\?\?()/i;
 
 // Default jsonp settings
 jQuery.ajaxSetup({
        jsonp: "callback",
        jsonpCallback: function() {
-               return "jsonp" + jsc++;
+               return jQuery.expando + "_" + ( jsc++ );
        }
 });