Ajax: make jQuery#load "type" field explicit

markelog · markelog · commit 1d3d2b1aa6bc · 2015-02-15T02:03:32.000+03:00
* Move "evalScript.php" file to appropriate place * Make jQuery#load "type" field explicit and add test for it Ref trac-11264 Ref 4ef120d
diff --git a/src/ajax/load.js b/src/ajax/load.js
@@ -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 ) {
diff --git a/test/data/ajax/evalScript.php b/test/data/ajax/evalScript.php
diff --git a/test/data/ajax/method.php b/test/data/ajax/method.php
@@ -0,0 +1 @@
+<?php echo $_SERVER['REQUEST_METHOD'] ?>
diff --git a/test/unit/ajax.js b/test/unit/ajax.js
@@ -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 );
 	});

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+<?php echo $_SERVER['REQUEST_METHOD'] ?>`