From 0f3d427bbdccec8597dff63494d390df6b441c24 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Sat, 4 Jun 2016 18:21:15 -0700 Subject: grunt [ci skip] --- js/dist/dropdown.js | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'js/dist/dropdown.js') diff --git a/js/dist/dropdown.js b/js/dist/dropdown.js index 97a3306ce..e5f310e64 100644 --- a/js/dist/dropdown.js +++ b/js/dist/dropdown.js @@ -25,6 +25,10 @@ var Dropdown = (function ($) { var EVENT_KEY = '.' + DATA_KEY; var DATA_API_KEY = '.data-api'; var JQUERY_NO_CONFLICT = $.fn[NAME]; + var ESCAPE_KEYCODE = 27; // KeyboardEvent.which value for Escape (Esc) key + var ARROW_UP_KEYCODE = 38; // KeyboardEvent.which value for up arrow key + var ARROW_DOWN_KEYCODE = 40; // KeyboardEvent.which value for down arrow key + var RIGHT_MOUSE_BUTTON_WHICH = 3; // MouseEvent.which value for the right button (assuming a right-handed mouse) var Event = { HIDE: 'hide' + EVENT_KEY, @@ -159,7 +163,7 @@ var Dropdown = (function ($) { }, { key: '_clearMenus', value: function _clearMenus(event) { - if (event && event.which === 3) { + if (event && event.which === RIGHT_MOUSE_BUTTON_WHICH) { return; } @@ -222,9 +226,9 @@ var Dropdown = (function ($) { var parent = Dropdown._getParentFromElement(this); var isActive = $(parent).hasClass(ClassName.OPEN); - if (!isActive && event.which !== 27 || isActive && event.which === 27) { + if (!isActive && event.which !== ESCAPE_KEYCODE || isActive && event.which === ESCAPE_KEYCODE) { - if (event.which === 27) { + if (event.which === ESCAPE_KEYCODE) { var toggle = $(parent).find(Selector.DATA_TOGGLE)[0]; $(toggle).trigger('focus'); } @@ -245,12 +249,12 @@ var Dropdown = (function ($) { var index = items.indexOf(event.target); - if (event.which === 38 && index > 0) { + if (event.which === ARROW_UP_KEYCODE && index > 0) { // up index--; } - if (event.which === 40 && index < items.length - 1) { + if (event.which === ARROW_DOWN_KEYCODE && index < items.length - 1) { // down index++; } -- cgit v1.2.3