Commit 1d3d2b1a authored by Oleg Gaidarenko's avatar Oleg Gaidarenko

Ajax: make jQuery#load "type" field explicit

* Move "evalScript.php" file to appropriate place

* Make jQuery#load "type" field explicit and add test for it

Ref trac-11264
Ref 4ef120d3f2578fe3d52eb6c0d0641df945991391
parent 4b3e6306
......@@ -46,8 +46,10 @@ jQuery.fn.load = function( url, params, callback ) {
jQuery.ajax({
url: url,
// if "type" variable is undefined, then "GET" method will be used
type: type,
// If "type" variable is undefined, then "GET" method will be used.
// Make value of this field explicit since
// user can override it through ajaxSetup method
type: type || "GET",
dataType: "html",
data: params
}).done(function( responseText ) {
......
<?php echo $_SERVER['REQUEST_METHOD'] ?>
......@@ -1689,11 +1689,22 @@ module( "ajax", {
ok( false, "Global event triggered" );
});
jQuery("#qunit-fixture").append("<script src='data/evalScript.php'></script>");
jQuery("#qunit-fixture").append("<script src='data/ajax/evalScript.php'></script>");
jQuery( document ).off("ajaxStart ajaxStop");
});
asyncTest( "jQuery#load() - always use GET method even if it overrided through ajaxSetup (#11264)", 1, function() {
jQuery.ajaxSetup({
type: "POST"
});
jQuery( "#qunit-fixture" ).load( "data/ajax/method.php", function( method ) {
equal( method, "GET" );
start();
});
});
asyncTest( "#11402 - jQuery.domManip() - script in comments are properly evaluated", 2, function() {
jQuery("#qunit-fixture").load( "data/cleanScript.html", start );
});
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment