Ticket #2020: 2020-2.diff

test/unit/ajax.js

@@ -449 +449 @@
     $.ajax({
         url: "data/jsonp.php",
         dataType: "jsonp",
-        data: { callback: "?" },
+        jsonp: "callback",
         success: function(data){
             ok( data.data, "JSON results returned (GET, data obj callback)" );
             plus();
@@ -492 +492 @@
     $.ajax({
         type: "POST",
         url: "data/jsonp.php",
-        data: { callback: "?" },
+        jsonp: "callback",
         dataType: "jsonp",
         success: function(data){
             ok( data.data, "JSON results returned (POST, data obj callback)" );
@@ -558 +558 @@
     $.ajax({
         url: base + "data/jsonp.php",
         dataType: "jsonp",
-        data: { callback: "?" },
+        jsonp: "callback",
         success: function(data){
             ok( data.data, "JSON results returned (GET, data obj callback)" );
             plus();

src/ajax.js

@@ -151 +151 @@
     lastModified: {},
 
     ajax: function( s ) {
-        var jsonp, jsre = /=(\?|%3F)/g, status, data;
+        var jsonp, jsre = /=\?/g, status, data;
 
         // Extend the settings, but re-extend 's' so that it can be
         // checked again later (in the test suite, specifically)