Skip to content
GitLab
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
fa9d28b6
Commit
fa9d28b6
authored
10 years ago
by
Emmanuel Bourgerie
Committed by
Chris Rebert
10 years ago
Browse files
Options
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
js/dropdown.js
+2
-0
js/dropdown.js
js/tests/unit/dropdown.js
+38
-0
js/tests/unit/dropdown.js
with
40 additions
and
0 deletions
+40
-0
js/dropdown.js
+
2
-
0
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
...
...
This diff is collapsed.
Click to expand it.
js/tests/unit/dropdown.js
+
38
-
0
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
'
)
})
})
})
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