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
fa9d28b6
Commit
fa9d28b6
authored
Mar 16, 2015
by
Emmanuel Bourgerie
Committed by
Chris Rebert
Mar 21, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix #16072: Clicking into input field within dropdown no longer closes the dropdown
Closes #16073 by merging it
parent
74ae4988
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
40 additions
and
0 deletions
+40
-0
js/dropdown.js
js/dropdown.js
+2
-0
js/tests/unit/dropdown.js
js/tests/unit/dropdown.js
+38
-0
No files found.
js/dropdown.js
View file @
fa9d28b6
...
@@ -99,6 +99,8 @@
...
@@ -99,6 +99,8 @@
if
(
!
$parent
.
hasClass
(
'
open
'
))
return
if
(
!
$parent
.
hasClass
(
'
open
'
))
return
if
(
e
&&
e
.
type
==
'
click
'
&&
/input|textarea/i
.
test
(
e
.
target
.
tagName
)
&&
$
.
contains
(
$parent
[
0
],
e
.
target
))
return
$parent
.
trigger
(
e
=
$
.
Event
(
'
hide.bs.dropdown
'
,
relatedTarget
))
$parent
.
trigger
(
e
=
$
.
Event
(
'
hide.bs.dropdown
'
,
relatedTarget
))
if
(
e
.
isDefaultPrevented
())
return
if
(
e
.
isDefaultPrevented
())
return
...
...
js/tests/unit/dropdown.js
View file @
fa9d28b6
...
@@ -350,4 +350,42 @@ $(function () {
...
@@ -350,4 +350,42 @@ $(function () {
assert
.
ok
(
!
$
(
document
.
activeElement
).
parent
().
is
(
'
.disabled
'
),
'
.disabled is not focused
'
)
assert
.
ok
(
!
$
(
document
.
activeElement
).
parent
().
is
(
'
.disabled
'
),
'
.disabled is not focused
'
)
})
})
QUnit
.
test
(
'
should not close the dropdown if the user clicks on a text field
'
,
function
(
assert
)
{
assert
.
expect
(
1
)
var
dropdownHTML
=
'
<div class="btn-group">
'
+
'
<button type="button" data-toggle="dropdown">Dropdown</button>
'
+
'
<ul class="dropdown-menu" role="menu">
'
+
'
<li><input id="textField" type="text" /></li>
'
+
'
</ul>
'
+
'
</div>
'
var
$dropdown
=
$
(
dropdownHTML
)
.
appendTo
(
'
#qunit-fixture
'
)
.
find
(
'
[data-toggle="dropdown"]
'
)
.
bootstrapDropdown
()
.
trigger
(
'
click
'
)
$
(
'
#textField
'
).
trigger
(
'
click
'
)
assert
.
ok
(
$dropdown
.
parent
(
'
.btn-group
'
).
hasClass
(
'
open
'
),
'
dropdown menu is open
'
)
})
QUnit
.
test
(
'
should not close the dropdown if the user clicks on a textarea
'
,
function
(
assert
)
{
assert
.
expect
(
1
)
var
dropdownHTML
=
'
<div class="btn-group">
'
+
'
<button type="button" data-toggle="dropdown">Dropdown</button>
'
+
'
<ul class="dropdown-menu" role="menu">
'
+
'
<li><textarea id="textArea"></textarea></li>
'
+
'
</ul>
'
+
'
</div>
'
var
$dropdown
=
$
(
dropdownHTML
)
.
appendTo
(
'
#qunit-fixture
'
)
.
find
(
'
[data-toggle="dropdown"]
'
)
.
bootstrapDropdown
()
.
trigger
(
'
click
'
)
$
(
'
#textArea
'
).
trigger
(
'
click
'
)
assert
.
ok
(
$dropdown
.
parent
(
'
.btn-group
'
).
hasClass
(
'
open
'
),
'
dropdown menu is open
'
)
})
})
})
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