From 5a35ad6d74c8d9e5aa99a1fc255300a8fd2ac0b4 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Mon, 30 May 2016 23:42:00 -0700 Subject: Use named constants for magic numbers (#19992) Mostly KeyboardEvent.which and MouseEvent.which values. [skip validator] --- js/src/dropdown.js | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) (limited to 'js/src/dropdown.js') diff --git a/js/src/dropdown.js b/js/src/dropdown.js index 92f841bc4..b2da8f4e4 100644 --- a/js/src/dropdown.js +++ b/js/src/dropdown.js @@ -17,12 +17,16 @@ const Dropdown = (($) => { * ------------------------------------------------------------------------ */ - const NAME = 'dropdown' - const VERSION = '4.0.0-alpha.2' - const DATA_KEY = 'bs.dropdown' - const EVENT_KEY = `.${DATA_KEY}` - const DATA_API_KEY = '.data-api' - const JQUERY_NO_CONFLICT = $.fn[NAME] + const NAME = 'dropdown' + const VERSION = '4.0.0-alpha.2' + const DATA_KEY = 'bs.dropdown' + const EVENT_KEY = `.${DATA_KEY}` + const DATA_API_KEY = '.data-api' + const JQUERY_NO_CONFLICT = $.fn[NAME] + const ESCAPE_KEYCODE = 27 // KeyboardEvent.which value for Escape (Esc) key + const ARROW_UP_KEYCODE = 38 // KeyboardEvent.which value for up arrow key + const ARROW_DOWN_KEYCODE = 40 // KeyboardEvent.which value for down arrow key + const RIGHT_MOUSE_BUTTON_WHICH = 3 // MouseEvent.which value for the right button (assuming a right-handed mouse) const Event = { HIDE : `hide${EVENT_KEY}`, @@ -152,7 +156,7 @@ const Dropdown = (($) => { } static _clearMenus(event) { - if (event && event.which === 3) { + if (event && event.which === RIGHT_MOUSE_BUTTON_WHICH) { return } @@ -218,10 +222,10 @@ const Dropdown = (($) => { let parent = Dropdown._getParentFromElement(this) let 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) { let toggle = $(parent).find(Selector.DATA_TOGGLE)[0] $(toggle).trigger('focus') } @@ -242,11 +246,11 @@ const Dropdown = (($) => { let index = items.indexOf(event.target) - if (event.which === 38 && index > 0) { // up + if (event.which === ARROW_UP_KEYCODE && index > 0) { // up index-- } - if (event.which === 40 && index < items.length - 1) { // down + if (event.which === ARROW_DOWN_KEYCODE && index < items.length - 1) { // down index++ } -- cgit v1.2.3 From 24e992a6ffbb3b54424eb1042d49005124b265d9 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 27 Jul 2016 09:31:24 -0700 Subject: bump versions --- js/src/dropdown.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'js/src/dropdown.js') diff --git a/js/src/dropdown.js b/js/src/dropdown.js index b2da8f4e4..e0f4a1822 100644 --- a/js/src/dropdown.js +++ b/js/src/dropdown.js @@ -3,7 +3,7 @@ import Util from './util' /** * -------------------------------------------------------------------------- - * Bootstrap (v4.0.0-alpha.2): dropdown.js + * Bootstrap (v4.0.0-alpha.3): dropdown.js * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * -------------------------------------------------------------------------- */ @@ -18,7 +18,7 @@ const Dropdown = (($) => { */ const NAME = 'dropdown' - const VERSION = '4.0.0-alpha.2' + const VERSION = '4.0.0-alpha.3' const DATA_KEY = 'bs.dropdown' const EVENT_KEY = `.${DATA_KEY}` const DATA_API_KEY = '.data-api' -- cgit v1.2.3 From 5495a4b3d383c745065a177d3adb8e5db94acd7f Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 5 Sep 2016 12:41:44 -0700 Subject: versions --- js/src/dropdown.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'js/src/dropdown.js') diff --git a/js/src/dropdown.js b/js/src/dropdown.js index e0f4a1822..e38792d3b 100644 --- a/js/src/dropdown.js +++ b/js/src/dropdown.js @@ -3,7 +3,7 @@ import Util from './util' /** * -------------------------------------------------------------------------- - * Bootstrap (v4.0.0-alpha.3): dropdown.js + * Bootstrap (v4.0.0-alpha.4): dropdown.js * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * -------------------------------------------------------------------------- */ @@ -18,7 +18,7 @@ const Dropdown = (($) => { */ const NAME = 'dropdown' - const VERSION = '4.0.0-alpha.3' + const VERSION = '4.0.0-alpha.4' const DATA_KEY = 'bs.dropdown' const EVENT_KEY = `.${DATA_KEY}` const DATA_API_KEY = '.data-api' -- cgit v1.2.3