From: David Serduke <davidserduke@gmail.com>
Date: Thu, 29 Nov 2007 19:07:20 +0000 (+0000)
Subject: Fixed #1557, although it doesn't appear to be just an FF3 problem. In this case,... 
X-Git-Url: http://git.asbjorn.it/?a=commitdiff_plain;ds=sidebyside;h=4b8f6cdc86c395fb92c7d50e8642118963232af4;hp=7ac564cd98a869d558ea4b3be6919baab0f48d10;p=jquery.git

Fixed #1557, although it doesn't appear to be just an FF3 problem. In this case, $.getJSON() wasn't working from a remote host. I went ahead and added a unit test then added the s.dataType == "json" test for a remote <script> load.  The said that json was allowed but the dataType check was missing. This appears to have fixed the bug across all browsers.
---

diff --git a/src/ajax.js b/src/ajax.js
index 8e7655c..6821cec 100644
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -217,7 +217,7 @@ jQuery.extend({
 
 		// If we're requesting a remote document
 		// and trying to load JSON or Script
-		if ( !s.url.indexOf("http") && s.dataType == "script" ) {
+		if ( !s.url.indexOf("http") && ( s.dataType == "script" || s.dataType =="json" ) ) {
 			var head = document.getElementsByTagName("head")[0];
 			var script = document.createElement("script");
 			script.src = s.url;
diff --git a/test/data/json_assigned_obj.js b/test/data/json_assigned_obj.js
new file mode 100644
index 0000000..867251d
--- /dev/null
+++ b/test/data/json_assigned_obj.js
@@ -0,0 +1 @@
+json_assigned_obj = { "test" : "worked" };
diff --git a/test/unit/ajax.js b/test/unit/ajax.js
index 162650f..3e2ac9f 100644
--- a/test/unit/ajax.js
+++ b/test/unit/ajax.js
@@ -513,6 +513,19 @@ test("$.getJSON(String, Function) - JSON object", function() {
 	});
 });
 
+test("$.getJSON(String, Function) - Remote JSON object with assignment", function() {
+	expect(2);
+
+	var base = window.location.href.replace(/\?.*$/, "");
+
+	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' );
+	  start();
+	});
+});
+
 test("$.post(String, Hash, Function) - simple with xml", function() {
 	expect(4);
 	stop();