aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--js/dropdown.js5
1 files changed, 3 insertions, 2 deletions
diff --git a/js/dropdown.js b/js/dropdown.js
index 3f71c7569..0a210ef35 100644
--- a/js/dropdown.js
+++ b/js/dropdown.js
@@ -77,7 +77,8 @@
return $this.click()
}
- var $items = $('[role=menu] li:not(.divider):visible a', $parent)
+ var desc = ' li:not(.divider):visible a'
+ var $items = $parent.find('[role=menu]' + desc + ', [role=listbox]' + desc)
if (!$items.length) return
@@ -149,6 +150,6 @@
.on('click.bs.dropdown.data-api', clearMenus)
.on('click.bs.dropdown.data-api', '.dropdown form', function (e) { e.stopPropagation() })
.on('click.bs.dropdown.data-api' , toggle, Dropdown.prototype.toggle)
- .on('keydown.bs.dropdown.data-api', toggle + ', [role=menu]' , Dropdown.prototype.keydown)
+ .on('keydown.bs.dropdown.data-api', toggle + ', [role=menu], [role=listbox]' , Dropdown.prototype.keydown)
}(jQuery);