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/modal.js') 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/modal.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'js/src/modal.js') 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() } }) -- 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/modal.js') 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 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/modal.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'js/src/modal.js') diff --git a/js/src/modal.js b/js/src/modal.js index bf0a7608f..9b3a99ddd 100644 --- a/js/src/modal.js +++ b/js/src/modal.js @@ -3,7 +3,7 @@ import Util from './util' /** * -------------------------------------------------------------------------- - * Bootstrap (v4.0.0-alpha.2): modal.js + * Bootstrap (v4.0.0-alpha.3): modal.js * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * -------------------------------------------------------------------------- */ @@ -18,7 +18,7 @@ const Modal = (($) => { */ const NAME = 'modal' - const VERSION = '4.0.0-alpha.2' + const VERSION = '4.0.0-alpha.3' const DATA_KEY = 'bs.modal' 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/modal.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'js/src/modal.js') diff --git a/js/src/modal.js b/js/src/modal.js index 9b3a99ddd..ebd3e4a34 100644 --- a/js/src/modal.js +++ b/js/src/modal.js @@ -3,7 +3,7 @@ import Util from './util' /** * -------------------------------------------------------------------------- - * Bootstrap (v4.0.0-alpha.3): modal.js + * Bootstrap (v4.0.0-alpha.4): modal.js * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * -------------------------------------------------------------------------- */ @@ -18,7 +18,7 @@ const Modal = (($) => { */ const NAME = 'modal' - const VERSION = '4.0.0-alpha.3' + const VERSION = '4.0.0-alpha.4' const DATA_KEY = 'bs.modal' const EVENT_KEY = `.${DATA_KEY}` const DATA_API_KEY = '.data-api' -- cgit v1.2.3