library-mirrors/jquery
1
0
Fork 0
mirror of https://github.com/jquery/jquery.git synced 2024-11-23 02:54:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Ajax: make jQuery#load "type" field explicit

Browse Source 
* Move "evalScript.php" file to appropriate place

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

Ref trac-11264
Ref 4ef120d3f2
This commit is contained in:
Oleg Gaidarenko 2015-02-15 01:25:02 +03:00
parent 4b3e63066d
commit 1d3d2b1aa6
4 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/ajax/load.js
View File

@ -46,8 +46,10 @@ jQuery.fn.load = function( url, params, callback ) {
jQuery.ajax({ jQuery.ajax({
url: url, url: url,
// if "type" variable is undefined, then "GET" method will be used // If "type" variable is undefined, then "GET" method will be used.
type: type, // Make value of this field explicit since
// user can override it through ajaxSetup method
type: type || "GET",
dataType: "html", dataType: "html",
data: params data: params
}).done(function( responseText ) { }).done(function( responseText ) {

0
test/data/evalScript.php → test/data/ajax/evalScript.php
View File

1
test/data/ajax/method.php Normal file
View File

@ -0,0 +1 @@
<?php echo $_SERVER['REQUEST_METHOD'] ?>

13
test/unit/ajax.js
View File

@ -1689,11 +1689,22 @@ module( "ajax", {
ok( false, "Global event triggered" ); 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"); 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() { asyncTest( "#11402 - jQuery.domManip() - script in comments are properly evaluated", 2, function() {
jQuery("#qunit-fixture").load( "data/cleanScript.html", start ); jQuery("#qunit-fixture").load( "data/cleanScript.html", start );
}); });