X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=src%2Fajax%2Fjsonp.js;h=cbe36804b9d04d0ee52c5cf590ddbe7846eada6f;hb=4e975430510f443ef76a90d077bc8956fb8b8cc0;hp=0588475b62a339aa44e72500cf72b167cca5adf5;hpb=dd5bf421225d23bc8732a92ea82049859c0cd57a;p=jquery.git

diff --git a/src/ajax/jsonp.js b/src/ajax/jsonp.js
index 0588475..cbe3680 100644
--- a/src/ajax/jsonp.js
+++ b/src/ajax/jsonp.js
@@ -1,21 +1,20 @@
 (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++ );
 	}
 });
 
 // Detect, normalize options and install callbacks for jsonp requests
-// (dataIsString is used internally)
-jQuery.ajaxPrefilter( "json jsonp", function( s, originalSettings, dataIsString ) {
+jQuery.ajaxPrefilter( "json jsonp", function( s, originalSettings, dataIsString /* internal */ ) {
 
-	dataIsString = ( typeof( s.data ) === "string" );
+	dataIsString = ( typeof s.data === "string" );
 
 	if ( s.dataTypes[ 0 ] === "jsonp" ||
 		originalSettings.jsonpCallback ||