Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
B
bootstrap
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
bootstrap
Commits
787404e0
Commit
787404e0
authored
Sep 08, 2014
by
Heinrich Fenkart
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #14287 from hnrch02/revert-13855-modal-mousedown
Revert #13855 due to #14263
parents
6cec0399
18c0a1c9
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
js/modal.js
js/modal.js
+1
-1
js/tests/unit/modal.js
js/tests/unit/modal.js
+2
-2
No files found.
js/modal.js
View file @
787404e0
...
@@ -169,7 +169,7 @@
...
@@ -169,7 +169,7 @@
this
.
$backdrop
=
$
(
'
<div class="modal-backdrop
'
+
animate
+
'
" />
'
)
this
.
$backdrop
=
$
(
'
<div class="modal-backdrop
'
+
animate
+
'
" />
'
)
.
appendTo
(
this
.
$body
)
.
appendTo
(
this
.
$body
)
this
.
$element
.
on
(
'
mousedown
.dismiss.bs.modal
'
,
$
.
proxy
(
function
(
e
)
{
this
.
$element
.
on
(
'
click
.dismiss.bs.modal
'
,
$
.
proxy
(
function
(
e
)
{
if
(
e
.
target
!==
e
.
currentTarget
)
return
if
(
e
.
target
!==
e
.
currentTarget
)
return
this
.
options
.
backdrop
==
'
static
'
this
.
options
.
backdrop
==
'
static
'
?
this
.
$element
[
0
].
focus
.
call
(
this
.
$element
[
0
])
?
this
.
$element
[
0
].
focus
.
call
(
this
.
$element
[
0
])
...
...
js/tests/unit/modal.js
View file @
787404e0
...
@@ -141,7 +141,7 @@ $(function () {
...
@@ -141,7 +141,7 @@ $(function () {
notEqual
(
$
(
'
#modal-test
'
).
length
,
0
,
'
modal insterted into dom
'
)
notEqual
(
$
(
'
#modal-test
'
).
length
,
0
,
'
modal insterted into dom
'
)
$
(
'
.contents
'
).
click
()
$
(
'
.contents
'
).
click
()
ok
(
$
(
'
#modal-test
'
).
is
(
'
:visible
'
),
'
modal visible
'
)
ok
(
$
(
'
#modal-test
'
).
is
(
'
:visible
'
),
'
modal visible
'
)
$
(
'
#modal-test
'
).
mousedown
()
$
(
'
#modal-test
'
).
click
()
})
})
.
on
(
'
hidden.bs.modal
'
,
function
()
{
.
on
(
'
hidden.bs.modal
'
,
function
()
{
ok
(
!
$
(
'
#modal-test
'
).
is
(
'
:visible
'
),
'
modal hidden
'
)
ok
(
!
$
(
'
#modal-test
'
).
is
(
'
:visible
'
),
'
modal hidden
'
)
...
@@ -196,7 +196,7 @@ $(function () {
...
@@ -196,7 +196,7 @@ $(function () {
$
(
'
<div id="modal-test"><div class="contents"/></div>
'
)
$
(
'
<div id="modal-test"><div class="contents"/></div>
'
)
.
on
(
'
shown.bs.modal
'
,
function
()
{
.
on
(
'
shown.bs.modal
'
,
function
()
{
triggered
=
0
triggered
=
0
$
(
'
#modal-test
'
).
mousedown
()
$
(
'
#modal-test
'
).
click
()
})
})
.
on
(
'
hide.bs.modal
'
,
function
()
{
.
on
(
'
hide.bs.modal
'
,
function
()
{
triggered
+=
1
triggered
+=
1
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a 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