diff options
| author | Pierre Vanduynslager <[email protected]> | 2017-04-09 18:16:37 -0400 |
|---|---|---|
| committer | GitHub <[email protected]> | 2017-04-09 18:16:37 -0400 |
| commit | d3fbebefcd8a0931f51341c8fe59a075578753c8 (patch) | |
| tree | 67683e5fb0fb91d5213bb57286f9b3bdcd8b8e45 /js/src | |
| parent | fe72daf2b34263d3cfc9bc77e9998cd22adfa34d (diff) | |
| parent | 278ddd0acd9700917791af0b67d44bc21ed17498 (diff) | |
| download | bootstrap-d3fbebefcd8a0931f51341c8fe59a075578753c8.tar.xz bootstrap-d3fbebefcd8a0931f51341c8fe59a075578753c8.zip | |
Merge branch 'v4-dev' into dropdown-keyboard
Diffstat (limited to 'js/src')
| -rw-r--r-- | js/src/modal.js | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/js/src/modal.js b/js/src/modal.js index 779b9a402..02d463945 100644 --- a/js/src/modal.js +++ b/js/src/modal.js @@ -289,6 +289,7 @@ const Modal = (($) => { if (this._isShown && this._config.keyboard) { $(this._element).on(Event.KEYDOWN_DISMISS, (event) => { if (event.which === ESCAPE_KEYCODE) { + event.preventDefault() this.hide() } }) |