diff options
| -rw-r--r-- | src/event.js | 8 | ||||
| -rw-r--r-- | test/unit/event.js | 16 |
2 files changed, 20 insertions, 4 deletions
diff --git a/src/event.js b/src/event.js index 48ee8d174..4b6eb00e4 100644 --- a/src/event.js +++ b/src/event.js @@ -746,10 +746,10 @@ jQuery.each( { focus: "focusin", blur: "focusout" }, function( type, delegateTyp return true; }, - // Suppress native focus or blur as it's already being fired - // in leverageNative. - _default: function() { - return true; + // Suppress native focus or blur if we're currently inside + // a leveraged native-event stack + _default: function( event ) { + return dataPriv.get( event.target, type ); }, delegateType: delegateType diff --git a/test/unit/event.js b/test/unit/event.js index edd9ecaea..1f76c54b9 100644 --- a/test/unit/event.js +++ b/test/unit/event.js @@ -3325,6 +3325,22 @@ QUnit.test( "focus change during a focus handler (gh-4382)", function( assert ) } ); } ); +QUnit.test( "trigger(focus) works after .on(focus).off(focus) (gh-4867)", function( assert ) { + assert.expect( 1 ); + + var input = jQuery( "<input />" ); + + input.appendTo( "#qunit-fixture" ); + + input + .on( "focus", function() {} ) + .off( "focus" ); + + input.trigger( "focus" ); + + assert.equal( document.activeElement, input[ 0 ], "input has focus" ); +} ); + // TODO replace with an adaptation of // https://github.com/jquery/jquery/pull/1367/files#diff-a215316abbaabdf71857809e8673ea28R2464 ( function() { |