diff options
| author | Giovanni Mendoza <[email protected]> | 2020-01-10 03:06:12 -0600 |
|---|---|---|
| committer | XhmikosR <[email protected]> | 2020-01-10 11:06:12 +0200 |
| commit | 954a0b1e6a206e4df910d4799d013f4388a2ef40 (patch) | |
| tree | 59e1d72bc0452427421b7f856d57eeecd48b6b5e /js/src | |
| parent | 4e1fb4fe1a4e968d83d8f62007b9354e2811eb63 (diff) | |
| download | bootstrap-954a0b1e6a206e4df910d4799d013f4388a2ef40.tar.xz bootstrap-954a0b1e6a206e4df910d4799d013f4388a2ef40.zip | |
Close modal with keyboard=true & backdrop=static (#29986)
* Close modal with keyboard=true & backdrop=static
Diffstat (limited to 'js/src')
| -rw-r--r-- | js/src/modal.js | 7 |
1 files changed, 5 insertions, 2 deletions
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() } }) |