From 1d3d2b1aa6bcd4de9e3a2d16f98685ac8726311c Mon Sep 17 00:00:00 2001
From: Oleg Gaidarenko <markelog@gmail.com>
Date: Sun, 15 Feb 2015 01:25:02 +0300
Subject: 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
---
 src/ajax/load.js              |  6 ++++--
 test/data/ajax/evalScript.php |  1 +
 test/data/ajax/method.php     |  1 +
 test/data/evalScript.php      |  1 -
 test/unit/ajax.js             | 13 ++++++++++++-
 5 files changed, 18 insertions(+), 4 deletions(-)
 create mode 100644 test/data/ajax/evalScript.php
 create mode 100644 test/data/ajax/method.php
 delete mode 100644 test/data/evalScript.php

diff --git a/src/ajax/load.js b/src/ajax/load.js
index e2f19affc..9d868a5dd 100644
--- 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
new file mode 100644
index 000000000..ea9b8c55f
--- /dev/null
+++ b/test/data/ajax/evalScript.php
@@ -0,0 +1 @@
+ok( "<?php echo $_SERVER['REQUEST_METHOD'] ?>" === "GET", "request method is <?php echo $_SERVER['REQUEST_METHOD'] ?>" );
\ No newline at end of file
diff --git a/test/data/ajax/method.php b/test/data/ajax/method.php
new file mode 100644
index 000000000..d76ff964b
--- /dev/null
+++ b/test/data/ajax/method.php
@@ -0,0 +1 @@
+<?php echo $_SERVER['REQUEST_METHOD'] ?>
diff --git a/test/data/evalScript.php b/test/data/evalScript.php
deleted file mode 100644
index ea9b8c55f..000000000
--- a/test/data/evalScript.php
+++ /dev/null
@@ -1 +0,0 @@
-ok( "<?php echo $_SERVER['REQUEST_METHOD'] ?>" === "GET", "request method is <?php echo $_SERVER['REQUEST_METHOD'] ?>" );
\ No newline at end of file
diff --git a/test/unit/ajax.js b/test/unit/ajax.js
index d048fdad9..718ddaf82 100644
--- 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 );
 	});
-- 
cgit v1.2.3