diff options
| author | Mark Otto <[email protected]> | 2012-12-26 09:21:34 -0600 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-12-26 09:21:34 -0600 |
| commit | 9749d6afc2730d41cab0111e1cc19bba7c5c3676 (patch) | |
| tree | 5420af50b680ac608d6ed177d24d79870dcad544 /js/bootstrap-dropdown.js | |
| parent | f74990d898b08be61f0f8b514378adf223d55a4b (diff) | |
| parent | b9c7f29134f2fa81931fa4663fc40ef7a0e363d1 (diff) | |
| download | bootstrap-9749d6afc2730d41cab0111e1cc19bba7c5c3676.tar.xz bootstrap-9749d6afc2730d41cab0111e1cc19bba7c5c3676.zip | |
Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip
Diffstat (limited to 'js/bootstrap-dropdown.js')
| -rw-r--r-- | js/bootstrap-dropdown.js | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/js/bootstrap-dropdown.js b/js/bootstrap-dropdown.js index bc421884f..b8c585283 100644 --- a/js/bootstrap-dropdown.js +++ b/js/bootstrap-dropdown.js @@ -81,7 +81,10 @@ isActive = $parent.hasClass('open') - if (!isActive || (isActive && e.keyCode == 27)) return $this.click() + if (!isActive || (isActive && e.keyCode == 27)) { + if (e.which == 27) $parent.find(toggle).focus() + return $this.click() + } $items = $('[role=menu] li:not(.divider):visible a', $parent) @@ -154,7 +157,7 @@ $(document) .on('click.dropdown.data-api touchstart.dropdown.data-api', clearMenus) - .on('click.dropdown touchstart.dropdown.data-api', '.dropdown form', function (e) { e.stopPropagation() }) + .on('click.dropdown.data-api touchstart.dropdown.data-api', '.dropdown form', function (e) { e.stopPropagation() }) .on('touchstart.dropdown.data-api', '.dropdown-menu', function (e) { e.stopPropagation() }) .on('click.dropdown.data-api touchstart.dropdown.data-api' , toggle, Dropdown.prototype.toggle) .on('keydown.dropdown.data-api touchstart.dropdown.data-api', toggle + ', [role=menu]' , Dropdown.prototype.keydown) |