Changeset 4476

Timestamp:

01/17/08 21:38:58 (7 months ago)

Author:

davidserduke

Message:

Fixed #2174 by removing the s.dataType == "json" check for possible cross domain since it causes absolute urls to use a <script> tag ajax retrieval even though absolute urls work fine for retrieving local data. Cross-domain jsonp will still work since the $.ajax() function actually changes the s.dataType to "script" before it reaches this check in cases where it is s.dataType == "jsonp" or s.dataType == "json" and a parameter has =? in it.

Location:

trunk/jquery

Files:

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

trunk/jquery/src/ajax.js

@@ -233 +233 @@
         // If we're requesting a remote document
         // and trying to load JSON or Script with a GET
-        if ( (!s.url.indexOf("http") || !s.url.indexOf("//")) && ( s.dataType == "script" || s.dataType =="json" ) && s.type.toLowerCase() == "get" ) {
+        if ( (!s.url.indexOf("http") || !s.url.indexOf("//")) && s.dataType == "script" && s.type.toLowerCase() == "get" ) {
             var head = document.getElementsByTagName("head")[0];
             var script = document.createElement("script");

trunk/jquery/test/unit/ajax.js

@@ -650 +650 @@
 });
 
-test("$.getJSON(String, Function) - Remote JSON object with assignment", function() {
+test("$.getJSON(String, Function) - JSON object with absolute url to local content", function() {
     expect(2);
 
@@ -656 +656 @@
 
     stop();
-    $.getJSON(base + "data/json_assigned_obj.js", function() {
-      ok( typeof json_assigned_obj == "object", 'Check JSON loaded' );
-      equals( json_assigned_obj.test, "worked", 'Check JSON obj.test' );
+    $.getJSON(url(base + "data/json.php"), function(json) {
+      ok( json.data.lang == 'en', 'Check JSON: lang' );
+      ok( json.data.length == 25, 'Check JSON: length' );
       start();
     });