aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOleg Gaidarenko <markelog@gmail.com>2015-11-13 15:22:36 +0300
committerOleg Gaidarenko <markelog@gmail.com>2015-11-13 15:22:36 +0300
commit3cc496ceecdbd76b6c556e85b12696f7c4c09dd5 (patch)
tree419b9052252ff1134a25adcdfd4dcd41ece3c717
parent4f79b76deb05d20962db90a69f7ce9f7076add59 (diff)
downloadjquery-3cc496ceecdbd76b6c556e85b12696f7c4c09dd5.tar.gz
jquery-3cc496ceecdbd76b6c556e85b12696f7c4c09dd5.zip
Revert "Event: remove guard for falsy handler argument of jQuery#on method"
This reverts commit fac67a984268ef8f7de952666fda6d8d32754f5f.
-rw-r--r--src/event.js3
-rw-r--r--test/unit/event.js1
2 files changed, 2 insertions, 2 deletions
diff --git a/src/event.js b/src/event.js
index ddd92c5fc..280581249 100644
--- a/src/event.js
+++ b/src/event.js
@@ -70,6 +70,8 @@ function on( elem, types, selector, data, fn, one ) {
}
if ( fn === false ) {
fn = returnFalse;
+ } else if ( !fn ) {
+ return this;
}
if ( one === 1 ) {
@@ -654,7 +656,6 @@ jQuery.each( {
} );
jQuery.fn.extend( {
-
on: function( types, selector, data, fn ) {
return on( this, types, selector, data, fn );
},
diff --git a/test/unit/event.js b/test/unit/event.js
index cdebbb4e7..b207441c9 100644
--- a/test/unit/event.js
+++ b/test/unit/event.js
@@ -6,7 +6,6 @@ QUnit.module( "event", {
} );
QUnit.test( "on() with non-null,defined data", function( assert ) {
-
assert.expect( 2 );
var handler = function( event, data ) {