diff options
| author | Mark Otto <[email protected]> | 2014-10-02 22:18:46 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-10-02 22:18:46 -0700 |
| commit | 0f28bbf732312778886416c1e2d5f469412cd199 (patch) | |
| tree | a2873796d157079db4af3866806a5ef71fe5c00b /js | |
| parent | 82eaf3cdce087d85ecd29cdf2a35a2deb8771d7a (diff) | |
| parent | 62344098afe05722d5b6c0121d7da287b08e385c (diff) | |
| download | bootstrap-0f28bbf732312778886416c1e2d5f469412cd199.tar.xz bootstrap-0f28bbf732312778886416c1e2d5f469412cd199.zip | |
Merge branch 'master' of github.com:twbs/bootstrap
Diffstat (limited to 'js')
| -rw-r--r-- | js/dropdown.js | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/js/dropdown.js b/js/dropdown.js index 756fc21f5..8fa712775 100644 --- a/js/dropdown.js +++ b/js/dropdown.js @@ -55,7 +55,7 @@ } Dropdown.prototype.keydown = function (e) { - if (!/(38|40|27)/.test(e.keyCode)) return + if (!/(38|40|27|32)/.test(e.which)) return var $this = $(this) @@ -67,7 +67,7 @@ var $parent = getParent($this) var isActive = $parent.hasClass('open') - if (!isActive || (isActive && e.keyCode == 27)) { + if ((!isActive && e.which != 27) || (isActive && e.which == 27)) { if (e.which == 27) $parent.find(toggle).trigger('focus') return $this.trigger('click') } @@ -79,8 +79,8 @@ var index = $items.index($items.filter(':focus')) - if (e.keyCode == 38 && index > 0) index-- // up - if (e.keyCode == 40 && index < $items.length - 1) index++ // down + if (e.which == 38 && index > 0) index-- // up + if (e.which == 40 && index < $items.length - 1) index++ // down if (!~index) index = 0 $items.eq(index).trigger('focus') |