From 4d1b9d7ce7adcb3a16b81cb3561d5294f50d3c3a Mon Sep 17 00:00:00 2001 From: akai Date: Thu, 19 May 2016 04:53:01 +0800 Subject: Remove stray "~" in modal paddingRight value (#19932) [skip validator] --- js/src/modal.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'js/src') diff --git a/js/src/modal.js b/js/src/modal.js index 695ac569b..f52af09a2 100644 --- a/js/src/modal.js +++ b/js/src/modal.js @@ -400,7 +400,7 @@ const Modal = (($) => { } if (this._isBodyOverflowing && !isModalOverflowing) { - this._element.style.paddingRight = `${this._scrollbarWidth}px~` + this._element.style.paddingRight = `${this._scrollbarWidth}px` } } -- cgit v1.2.3 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/carousel.js | 6 ++++-- js/src/dropdown.js | 28 ++++++++++++++++------------ js/src/modal.js | 3 ++- js/src/util.js | 4 +++- 4 files changed, 25 insertions(+), 16 deletions(-) (limited to 'js/src') diff --git a/js/src/carousel.js b/js/src/carousel.js index 34cab4391..f990c699a 100644 --- a/js/src/carousel.js +++ b/js/src/carousel.js @@ -24,6 +24,8 @@ const Carousel = (($) => { const DATA_API_KEY = '.data-api' const JQUERY_NO_CONFLICT = $.fn[NAME] const TRANSITION_DURATION = 600 + const ARROW_LEFT_KEYCODE = 37 // KeyboardEvent.which value for left arrow key + const ARROW_RIGHT_KEYCODE = 39 // KeyboardEvent.which value for right arrow key const Default = { interval : 5000, @@ -236,8 +238,8 @@ const Carousel = (($) => { } switch (event.which) { - case 37: this.prev(); break - case 39: this.next(); break + case ARROW_LEFT_KEYCODE: this.prev(); break + case ARROW_RIGHT_KEYCODE: this.next(); break default: return } } 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++ } diff --git a/js/src/modal.js b/js/src/modal.js index f52af09a2..2f26bc0d9 100644 --- a/js/src/modal.js +++ b/js/src/modal.js @@ -25,6 +25,7 @@ const Modal = (($) => { const JQUERY_NO_CONFLICT = $.fn[NAME] const TRANSITION_DURATION = 300 const BACKDROP_TRANSITION_DURATION = 150 + const ESCAPE_KEYCODE = 27 // Escape (Esc) key const Default = { backdrop : true, @@ -271,7 +272,7 @@ const Modal = (($) => { _setEscapeEvent() { if (this._isShown && this._config.keyboard) { $(this._element).on(Event.KEYDOWN_DISMISS, (event) => { - if (event.which === 27) { + if (event.which === ESCAPE_KEYCODE) { this.hide() } }) diff --git a/js/src/util.js b/js/src/util.js index dba6e9bd6..070c5ea75 100644 --- a/js/src/util.js +++ b/js/src/util.js @@ -16,6 +16,8 @@ const Util = (($) => { let transition = false + const MAX_UID = 1000000 + const TransitionEndEvent = { WebkitTransition : 'webkitTransitionEnd', MozTransition : 'transitionend', @@ -100,7 +102,7 @@ const Util = (($) => { getUID(prefix) { do { /* eslint-disable no-bitwise */ - prefix += ~~(Math.random() * 1000000) // "~~" acts like a faster Math.floor() here + prefix += ~~(Math.random() * MAX_UID) // "~~" acts like a faster Math.floor() here /* eslint-enable no-bitwise */ } while (document.getElementById(prefix)) return prefix -- cgit v1.2.3 From c4add0c2f30b8404bd1d227b16d7668a236c1d63 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Tue, 31 May 2016 00:45:32 -0700 Subject: Comply with consistent-return ESLint rule --- js/src/scrollspy.js | 1 + js/src/util.js | 1 + 2 files changed, 2 insertions(+) (limited to 'js/src') diff --git a/js/src/scrollspy.js b/js/src/scrollspy.js index b9186db00..001f7f56c 100644 --- a/js/src/scrollspy.js +++ b/js/src/scrollspy.js @@ -140,6 +140,7 @@ const ScrollSpy = (($) => { targetSelector ] } + return null }) .filter((item) => item) .sort((a, b) => a[0] - b[0]) diff --git a/js/src/util.js b/js/src/util.js index 070c5ea75..b779c448f 100644 --- a/js/src/util.js +++ b/js/src/util.js @@ -42,6 +42,7 @@ const Util = (($) => { if ($(event.target).is(this)) { return event.handleObj.handler.apply(this, arguments) } + return undefined } } } -- cgit v1.2.3 From 5dcd1a743dfdca0464099bc52fe4675fdff25924 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Tue, 31 May 2016 02:19:56 -0700 Subject: Tweak Esc key comment in modal.js [skip sauce] [skip validator] --- js/src/modal.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'js/src') diff --git a/js/src/modal.js b/js/src/modal.js index 2f26bc0d9..bf0a7608f 100644 --- a/js/src/modal.js +++ b/js/src/modal.js @@ -25,7 +25,7 @@ const Modal = (($) => { const JQUERY_NO_CONFLICT = $.fn[NAME] const TRANSITION_DURATION = 300 const BACKDROP_TRANSITION_DURATION = 150 - const ESCAPE_KEYCODE = 27 // Escape (Esc) key + const ESCAPE_KEYCODE = 27 // KeyboardEvent.which value for Escape (Esc) key const Default = { backdrop : true, -- cgit v1.2.3