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
b395f352
Commit
b395f352
authored
Jan 08, 2015
by
vsn4ik
Committed by
Heinrich Fenkart
Feb 26, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Dropdowns: Skip `.disabled` instead of `.divider` on keydown event
Fixes #15147. Closes #15520 by merging it.
parent
5debbec5
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
22 additions
and
1 deletion
+22
-1
js/dropdown.js
js/dropdown.js
+1
-1
js/tests/unit/dropdown.js
js/tests/unit/dropdown.js
+21
-0
No files found.
js/dropdown.js
View file @
b395f352
...
...
@@ -72,7 +72,7 @@
return
$this
.
trigger
(
'
click
'
)
}
var
desc
=
'
li:not(.di
vider
):visible a
'
var
desc
=
'
li:not(.di
sabled
):visible a
'
var
$items
=
$parent
.
find
(
'
[role="menu"]
'
+
desc
+
'
, [role="listbox"]
'
+
desc
)
if
(
!
$items
.
length
)
return
...
...
js/tests/unit/dropdown.js
View file @
b395f352
...
...
@@ -314,4 +314,25 @@ $(function () {
$dropdown
.
click
()
})
QUnit
.
test
(
'
should skip disabled element when using keyboard navigation
'
,
function
(
assert
)
{
var
dropdownHTML
=
'
<ul class="tabs">
'
+
'
<li class="dropdown">
'
+
'
<a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown</a>
'
+
'
<ul class="dropdown-menu" role="menu">
'
+
'
<li class="disabled"><a href="#">Disabled link</a></li>
'
+
'
<li><a href="#">Another link</a></li>
'
+
'
</ul>
'
+
'
</li>
'
+
'
</ul>
'
var
$dropdown
=
$
(
dropdownHTML
)
.
appendTo
(
'
#qunit-fixture
'
)
.
find
(
'
[data-toggle="dropdown"]
'
)
.
bootstrapDropdown
()
.
click
()
$dropdown
.
trigger
(
$
.
Event
(
'
keydown
'
,
{
which
:
40
}))
$dropdown
.
trigger
(
$
.
Event
(
'
keydown
'
,
{
which
:
40
}))
assert
.
ok
(
!
$
(
document
.
activeElement
).
parent
().
is
(
'
.disabled
'
),
'
.disabled is not focused
'
)
})
})
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