From 954a0b1e6a206e4df910d4799d013f4388a2ef40 Mon Sep 17 00:00:00 2001 From: Giovanni Mendoza Date: Fri, 10 Jan 2020 03:06:12 -0600 Subject: Close modal with keyboard=true & backdrop=static (#29986) * Close modal with keyboard=true & backdrop=static --- js/src/modal.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'js/src') diff --git a/js/src/modal.js b/js/src/modal.js index e2b711e5b..48ff5b854 100644 --- a/js/src/modal.js +++ b/js/src/modal.js @@ -306,9 +306,12 @@ class Modal { } _setEscapeEvent() { - if (this._isShown && this._config.keyboard) { + if (this._isShown) { EventHandler.on(this._element, Event.KEYDOWN_DISMISS, event => { - if (event.which === ESCAPE_KEYCODE) { + if (this._config.keyboard && event.which === ESCAPE_KEYCODE) { + event.preventDefault() + this.hide() + } else if (!this._config.keyboard && event.which === ESCAPE_KEYCODE) { this._triggerBackdropTransition() } }) -- cgit v1.2.3