aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick H. Lauke <[email protected]>2017-04-09 22:03:52 +0100
committerGitHub <[email protected]>2017-04-09 22:03:52 +0100
commit61536dd076a53219a96c2c173e022d8b0cd6fe80 (patch)
treeb02dbe5c3cbfaea4f45b1197e9928eadedd875e9
parentc5db196e7661259382efee35b5f1ea92fb5ae6d0 (diff)
parent6702107131b810da91fcec040c4d74f79d3a1a26 (diff)
downloadbootstrap-61536dd076a53219a96c2c173e022d8b0cd6fe80.tar.xz
bootstrap-61536dd076a53219a96c2c173e022d8b0cd6fe80.zip
Merge branch 'v4-dev' into v4-docs-button-group-a11y-patch1
-rw-r--r--js/src/modal.js1
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()
}
})