Changeset 4192

Timestamp:

12/17/07 00:44:00 (8 months ago)

Author:

jeresig

Message:

Added a fix for bug #2020 - if you want to do data: {callback: "?"}, do jsonp: "callback" instead.

Location:

trunk/jquery

Files:

• src/ajax.js (modified) (1 diff)
• test/unit/ajax.js (modified) (3 diffs)

trunk/jquery/src/ajax.js

@@ -152 +152 @@
 
     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

trunk/jquery/test/unit/ajax.js

@@ -450 +450 @@
         url: "data/jsonp.php",
         dataType: "jsonp",
-        data: { callback: "?" },
+        jsonp: "callback",
         success: function(data){
             ok( data.data, "JSON results returned (GET, data obj callback)" );
@@ -493 +493 @@
         type: "POST",
         url: "data/jsonp.php",
-        data: { callback: "?" },
+        jsonp: "callback",
         dataType: "jsonp",
         success: function(data){
@@ -559 +559 @@
         url: base + "data/jsonp.php",
         dataType: "jsonp",
-        data: { callback: "?" },
+        jsonp: "callback",
         success: function(data){
             ok( data.data, "JSON results returned (GET, data obj callback)" );