Skip to content
GitLab
Explore
Projects
Groups
Snippets
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Bootstrap
bootstrap
Commits
41abd1c7
Commit
41abd1c7
authored
7 years ago
by
Patrick H. Lauke
Committed by
GitHub
7 years ago
Browse files
Options
Download
Plain Diff
Merge branch 'v4-dev' into v4-dev-docs-navs-js-tabpanel-fix
parents
50d178ec
67021071
8 merge requests
!28721
Hot test
,
!27561
Adds font-weight-medium to font weight classes
,
!22598
test
,
!22401
Remove incorrect role="tabpanel" from navs docs
,
!25326
Adjust examples
,
!23995
Add back cursor: pointer for .btn-link
,
!23178
Spinner
,
!17021
v4
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
js/src/modal.js
+1
-0
js/src/modal.js
with
1 addition
and
0 deletions
+1
-0
js/src/modal.js
+
1
-
0
View file @
41abd1c7
...
...
@@ -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
()
}
})
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Snippets