Fixes #7229 and #5803

diff --git a/src/ajax.js b/src/ajax.js
index a40e223e76dd599790c08e18c086a11feb268922..915bbaa3e73d987799437bf2ee293031f515ea54 100644 (file)
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -208,6 +208,12 @@ jQuery.extend({
                        s.data = jQuery.param( s.data, s.traditional );
                }
 
+               // If the jsonpCallback has been set, we can assume that dataType is jsonp
+               // Ticket #5803
+               if ( s.jsonpCallback ) {
+                 s.dataType = "jsonp";
+               }
+
                // Handle JSONP Parameter Callbacks
                if ( s.dataType === "jsonp" ) {
                        if ( type === "GET" ) {

diff --git a/src/event.js b/src/event.js
index fb5a3ef8cc6fa0bd4f7ec79f201c093540111979..d491ae8a116998447ff54daff392f0fc2be31ba8 100644 (file)
--- a/src/event.js
+++ b/src/event.js
@@ -32,6 +32,9 @@ jQuery.event = {
 
                if ( handler === false ) {
                        handler = returnFalse;
+               } else if ( !handler ) {
+                 // Fixes bug #7229. Fix recommended by jdalton
+                 return;
                }
 
                var handleObjIn, handleObj;

diff --git a/test/unit/ajax.js b/test/unit/ajax.js
index 5704d73e0deddbb912e51d8988fe9b01b0462455..14c6218264a74362bacea9be2f388e0a1441bced 100644 (file)
--- a/test/unit/ajax.js
+++ b/test/unit/ajax.js
@@ -799,6 +799,21 @@ test("jQuery.ajax() - JSONP, Local", function() {
                        plus();
                }
        });
+       
+  // Supports Ticket #5803     
+       jQuery.ajax({
+               url: "data/jsonp.php",
+               jsonpCallback: "jsonpResults",
+               success: function(data){
+                       ok( data.data, "JSON results returned without dataType:jsonp when jsonpCallback is defined" );
+                       plus();
+               },
+               error: function(data){
+                       ok( false, "Ajax error JSON (GET, custom callback name)" );
+                       plus();
+               }
+       });             
+       
 });
 
 test("JSONP - Custom JSONP Callback", function() {

diff --git a/test/unit/event.js b/test/unit/event.js
index f3d314884f952acf7aac4bff3ce90485db650f01..5efa0ec51de44941de5d7956d8f4ea05e5a11c8a 100644 (file)
--- a/test/unit/event.js
+++ b/test/unit/event.js
@@ -1,5 +1,25 @@
 module("event");
 
+test("null or undefined handler", function() {
+       expect(2);
+  // Supports Fixes bug #7229
+  try {
+  
+    jQuery("#firstp").click(null);
+  
+    ok(true, "Passing a null handler will not throw an exception");
+
+  } catch (e) {}  
+
+  try {
+  
+    jQuery("#firstp").click(undefined);
+  
+    ok(true, "Passing an undefined handler will not throw an exception");
+
+  } catch (e) {}  
+});
+
 test("bind(), with data", function() {
        expect(3);
        var handler = function(event) {