From 0635df43914eec10e4b468ddb2f952f5024c644e Mon Sep 17 00:00:00 2001
From: David Serduke <davidserduke@gmail.com>
Date: Thu, 17 Jan 2008 21:38:58 +0000
Subject: [PATCH] =?utf8?q?Fixed=20#2174=20by=20removing=20the=20s.dataType=20?=
 =?utf8?q?=3D=3D=20"json"=20check=20for=20possible=20cross=20domain=20since=20?=
 =?utf8?q?it=20causes=20absolute=20urls=20to=20use=20a=20<script>=20tag=20aj?=
 =?utf8?q?ax=20retrieval=20even=20though=20absolute=20urls=20work=20fine=20f?=
 =?utf8?q?or=20retrieving=20local=20data.=20=20Cross-domain=20jsonp=20will=20?=
 =?utf8?q?still=20work=20since=20the=20$.ajax()=20function=20actually=20chan?=
 =?utf8?q?ges=20the=20s.dataType=20to=20"script"=20before=20it=20reaches=20t?=
 =?utf8?q?his=20check=20in=20cases=20where=20it=20is=20s.dataType=20=3D=3D=20?=
 =?utf8?q?"jsonp"=20or=20s.dataType=20=3D=3D=20"json"=20and=20a=20parameter=20?=
 =?utf8?q?has=20=3D=3F=20in=20it.?=

---
 src/ajax.js       |    2 +-
 test/unit/ajax.js |    8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/ajax.js b/src/ajax.js
index 0f799fc..3e72488 100644
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -232,7 +232,7 @@ jQuery.extend({
 
 		// 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");
 			script.src = s.url;
diff --git a/test/unit/ajax.js b/test/unit/ajax.js
index 8dcf759..15c4ed7 100644
--- a/test/unit/ajax.js
+++ b/test/unit/ajax.js
@@ -649,15 +649,15 @@ test("$.getJSON(String, Function) - JSON object", function() {
 	});
 });
 
-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);
 
 	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' );
+	$.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();
 	});
 });
-- 
1.7.10.4