Fixes #8277. Sets data to undefined rather than null when it is not provided in ajax...

diff --git a/src/ajax.js b/src/ajax.js
index 7ef8dec186669fc26a759b44f55e7036f03ae466..76a2dc81236923dabd9a01073b8e932ce379429a 100644 (file)
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -164,7 +164,7 @@ jQuery.fn.extend({
                        if ( jQuery.isFunction( params ) ) {
                                // We assume that it's the callback
                                callback = params;
-                               params = null;
+                               params = undefined;
 
                        // Otherwise, build a param string
                        } else if ( typeof params === "object" ) {
@@ -256,7 +256,7 @@ jQuery.each( [ "get", "post" ], function( i, method ) {
                if ( jQuery.isFunction( data ) ) {
                        type = type || callback;
                        callback = data;
-                       data = null;
+                       data = undefined;
                }
 
                return jQuery.ajax({
@@ -272,7 +272,7 @@ jQuery.each( [ "get", "post" ], function( i, method ) {
 jQuery.extend({
 
        getScript: function( url, callback ) {
-               return jQuery.get( url, null, callback, "script" );
+               return jQuery.get( url, undefined, callback, "script" );
        },
 
        getJSON: function( url, data, callback ) {

diff --git a/test/unit/ajax.js b/test/unit/ajax.js
index c9c06111fd01feb2480fc73b4745da83e6454692..80da7f8f88734bf59b190ca0862c71f002aa0192 100644 (file)
--- a/test/unit/ajax.js
+++ b/test/unit/ajax.js
@@ -1196,6 +1196,21 @@ test("load(String, String, Function)", function() {
        });
 });
 
+test("jQuery.get(String, Function) - data in ajaxSettings (#8277)", function() {
+       expect(1);
+       stop();
+       jQuery.ajaxSetup({
+               data: "helloworld"
+       });
+       jQuery.get(url('data/echoQuery.php'), function(data) {
+               ok( /helloworld$/.test( data ), 'Data from ajaxSettings was used');
+               jQuery.ajaxSetup({
+                       data: null
+               });
+               start();
+       });
+});
+
 test("jQuery.get(String, Hash, Function) - parse xml and use text() on nodes", function() {
        expect(2);
        stop();