Changeset 4155

Timestamp:

12/14/07 17:06:41 (9 months ago)

Author:

davidserduke

Message:

Fixed #2046 by forcing the dataType to 'html' in the .load() function.

Location:

trunk/jquery

Files:

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

trunk/jquery/src/ajax.js

@@ -35 +35 @@
             url: url,
             type: type,
+            dataType: "html",
             data: params,
             complete: function(res, status){

trunk/jquery/test/unit/ajax.js

@@ -318 +318 @@
 });
 
+test("load(String, Function) with ajaxSetup on dataType json, see #2046", function() {
+    expect(1);
+    stop();
+    $.ajaxSetup({ dataType: "json" });
+    $("#first").ajaxComplete(function (e, xml, s) {
+        equals( s.dataType, "html", "Verify the load() dataType was html" );
+        $("#first").unbind("ajaxComplete");
+        $.ajaxSetup({ dataType: "" });
+        start();
+    });
+    $('#first').load("data/test3.html");
+});
+
 test("load(String, Function) - simple: inject text into DOM", function() {
     expect(2);
@@ -333 +346 @@
     window.foobar = null;
     var verifyEvaluation = function() {
-      equals( foobar, "bar", 'Check if script src was evaluated after load' );
-      equals( $('#ap').html(), 'bar', 'Check if script evaluation has modified DOM');
-      start();
+        equals( foobar, "bar", 'Check if script src was evaluated after load' );
+        equals( $('#ap').html(), 'bar', 'Check if script evaluation has modified DOM');
+         start();
     };
     $('#first').load(url('data/test.html'), function() {
-      ok( $('#first').html().match(/^html text/), 'Check content after loading html' );
-      equals( $('#foo').html(), 'foo', 'Check if script evaluation has modified DOM');
-      equals( testFoo, "foo", 'Check if script was evaluated after load' );
-      setTimeout(verifyEvaluation, 600);
+        ok( $('#first').html().match(/^html text/), 'Check content after loading html' );
+        equals( $('#foo').html(), 'foo', 'Check if script evaluation has modified DOM');
+        equals( testFoo, "foo", 'Check if script was evaluated after load' );
+        setTimeout(verifyEvaluation, 600);
     });
 });
@@ -350 +363 @@
     testFoo = undefined;
     $('#first').load(url('data/test2.html'), function() {
-      ok( $('#foo').html() == 'foo', 'Check if script evaluation has modified DOM');
-      ok( testFoo == "foo", 'Check if script was evaluated after load' );
-      start();
+        ok( $('#foo').html() == 'foo', 'Check if script evaluation has modified DOM');
+        ok( testFoo == "foo", 'Check if script was evaluated after load' );
+        start();
     });
 });