git.asbjorn.biz
/
jquery.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of github.com:jquery/jquery
[jquery.git]
/
src
/
ajax
/
jsonp.js
diff --git
a/src/ajax/jsonp.js
b/src/ajax/jsonp.js
index
0588475
..
16a4c2f
100644
(file)
--- a/
src/ajax/jsonp.js
+++ b/
src/ajax/jsonp.js
@@
-1,7
+1,7
@@
(function( jQuery ) {
var jsc = jQuery.now(),
(function( jQuery ) {
var jsc = jQuery.now(),
- jsre = /(\=)(?:\?|%3F)(&|$)|()(?:\?\?|%3F%3F)()/i;
+ jsre = /(\=)\?(&|$)|()\?\?()/i;
// Default jsonp settings
jQuery.ajaxSetup({
// Default jsonp settings
jQuery.ajaxSetup({
@@
-12,10
+12,9
@@
jQuery.ajaxSetup({
});
// Detect, normalize options and install callbacks for jsonp requests
});
// 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 ||
if ( s.dataTypes[ 0 ] === "jsonp" ||
originalSettings.jsonpCallback ||