diff options
| author | Patrick H. Lauke <[email protected]> | 2017-04-09 22:05:10 +0100 |
|---|---|---|
| committer | GitHub <[email protected]> | 2017-04-09 22:05:10 +0100 |
| commit | 41abd1c7a5c96497130ef14dd152e26c042ec1d6 (patch) | |
| tree | f7d2e7132687b9d43d77fd046a3a06d78adc154e /js/src | |
| parent | 50d178ece0c22068938f5bc18d0a0d691ac0fb7c (diff) | |
| parent | 6702107131b810da91fcec040c4d74f79d3a1a26 (diff) | |
| download | bootstrap-41abd1c7a5c96497130ef14dd152e26c042ec1d6.tar.xz bootstrap-41abd1c7a5c96497130ef14dd152e26c042ec1d6.zip | |
Merge branch 'v4-dev' into v4-dev-docs-navs-js-tabpanel-fix
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() } }) |