Changeset 4123

Timestamp:

12/12/07 20:54:44 (1 year ago)

Author:

davidserduke

Message:

Fixed #1750 by adding a url that starts with "//" and is a dataType "script" will now use a cross domain load the same as urls that start with "http".

Location:

trunk/jquery

Files:

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

trunk/jquery/src/ajax.js

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

trunk/jquery/test/unit/ajax.js

@@ -373 +373 @@
     expect(2);
     stop();
+    window.foobar = null;
     $.getScript(url("data/test.js"), function() {
         equals( foobar, "bar", 'Check if script was evaluated' );
@@ -564 +565 @@
     stop();
 
+    window.foobar = null;
     $.ajax({
         url: base + "data/test.js",
@@ -581 +583 @@
     stop();
 
+    window.foobar = null;
     $.ajax({
         url: base + "data/test.js",
@@ -588 +591 @@
             ok( foobar, "Script results returned (GET, no callback)" );
             equals( status, "success", "Script results returned (GET, no callback)" );
+            start();
+        }
+    });
+});
+
+test("$.ajax() - script, Remote with scheme-less URL", function() {
+    expect(2);
+
+    var base = window.location.href.replace(/\?.*$/, "");
+    base = base.replace(/^.*?\/\//, "//");
+
+    stop();
+
+    window.foobar = null;
+    $.ajax({
+        url: base + "data/test.js",
+        dataType: "script",
+        success: function(data){
+            ok( foobar, "Script results returned (GET, no callback)" );
             start();
         }