diff options
| -rw-r--r-- | src/ajax.js | 2 | ||||
| -rw-r--r-- | test/unit/ajax.js | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/ajax.js b/src/ajax.js index 0f799fcc8..3e7248803 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 8dcf7591e..15c4ed744 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(); }); }); |