From 68b771a057b60ca5740cf9a1b0f8f9ec73e5dc56 Mon Sep 17 00:00:00 2001 From: Ben-Russell Date: Tue, 26 Aug 2014 14:34:21 -0700 Subject: Independently delegate data-api selectors Fixes #14462. Closes #14463 by merging it. --- js/dropdown.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'js/dropdown.js') diff --git a/js/dropdown.js b/js/dropdown.js index 7388f8124..fd7f658f7 100644 --- a/js/dropdown.js +++ b/js/dropdown.js @@ -154,6 +154,8 @@ .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"], [role="listbox"]', Dropdown.prototype.keydown) + .on('keydown.bs.dropdown.data-api', toggle, Dropdown.prototype.keydown) + .on('keydown.bs.dropdown.data-api', '[role="menu"]', Dropdown.prototype.keydown) + .on('keydown.bs.dropdown.data-api', '[role="listbox"]', Dropdown.prototype.keydown) }(jQuery); -- cgit v1.2.3