diff options
| author | Ben-Russell <[email protected]> | 2014-08-26 14:34:21 -0700 |
|---|---|---|
| committer | Heinrich Fenkart <[email protected]> | 2014-10-29 04:54:53 +0100 |
| commit | 68b771a057b60ca5740cf9a1b0f8f9ec73e5dc56 (patch) | |
| tree | 51bd082eedc237e1aca1e9bd532f4e7c83292709 /js/dropdown.js | |
| parent | 94b544c22940d8048e7ecda9f3484583894f45c5 (diff) | |
| download | bootstrap-68b771a057b60ca5740cf9a1b0f8f9ec73e5dc56.tar.xz bootstrap-68b771a057b60ca5740cf9a1b0f8f9ec73e5dc56.zip | |
Independently delegate data-api selectors
Fixes #14462.
Closes #14463 by merging it.
Diffstat (limited to 'js/dropdown.js')
| -rw-r--r-- | js/dropdown.js | 4 |
1 files changed, 3 insertions, 1 deletions
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); |