From f7ed579d91d92aff3bee8358d3de3a5a35246b3d Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Tue, 31 Mar 2020 21:27:35 +0300 Subject: Switch to string constants. (#30490) This allows the minifier to mangle the constants. It also allows the linter to find unused strings properly. While at it, remove a few unused properties. File Before After Diff -------------------------------------------------------- bootstrap.bundle.min.js 22.09 kB 21.13 kB -0.96 kB (-4.35 %) bootstrap.min.js 15.4 kB 14.46 kB -0.94 kB (-3.86 %) --- js/src/toast.js | 60 ++++++++++++++++++++++++++------------------------------- 1 file changed, 27 insertions(+), 33 deletions(-) (limited to 'js/src/toast.js') diff --git a/js/src/toast.js b/js/src/toast.js index 6e2a00783c..332b5e9031 100644 --- a/js/src/toast.js +++ b/js/src/toast.js @@ -20,20 +20,16 @@ const DATA_KEY = 'bs.toast' const EVENT_KEY = `.${DATA_KEY}` const JQUERY_NO_CONFLICT = $.fn[NAME] -const Event = { - CLICK_DISMISS : `click.dismiss${EVENT_KEY}`, - HIDE : `hide${EVENT_KEY}`, - HIDDEN : `hidden${EVENT_KEY}`, - SHOW : `show${EVENT_KEY}`, - SHOWN : `shown${EVENT_KEY}` -} +const EVENT_CLICK_DISMISS = `click.dismiss${EVENT_KEY}` +const EVENT_HIDE = `hide${EVENT_KEY}` +const EVENT_HIDDEN = `hidden${EVENT_KEY}` +const EVENT_SHOW = `show${EVENT_KEY}` +const EVENT_SHOWN = `shown${EVENT_KEY}` -const ClassName = { - FADE : 'fade', - HIDE : 'hide', - SHOW : 'show', - SHOWING : 'showing' -} +const CLASS_NAME_FADE = 'fade' +const CLASS_NAME_HIDE = 'hide' +const CLASS_NAME_SHOW = 'show' +const CLASS_NAME_SHOWING = 'showing' const DefaultType = { animation : 'boolean', @@ -47,9 +43,7 @@ const Default = { delay : 500 } -const Selector = { - DATA_DISMISS : '[data-dismiss="toast"]' -} +const SELECTOR_DATA_DISMISS = '[data-dismiss="toast"]' /** * ------------------------------------------------------------------------ @@ -82,7 +76,7 @@ class Toast { // Public show() { - const showEvent = $.Event(Event.SHOW) + const showEvent = $.Event(EVENT_SHOW) $(this._element).trigger(showEvent) if (showEvent.isDefaultPrevented()) { @@ -90,14 +84,14 @@ class Toast { } if (this._config.animation) { - this._element.classList.add(ClassName.FADE) + this._element.classList.add(CLASS_NAME_FADE) } const complete = () => { - this._element.classList.remove(ClassName.SHOWING) - this._element.classList.add(ClassName.SHOW) + this._element.classList.remove(CLASS_NAME_SHOWING) + this._element.classList.add(CLASS_NAME_SHOW) - $(this._element).trigger(Event.SHOWN) + $(this._element).trigger(EVENT_SHOWN) if (this._config.autohide) { this._timeout = setTimeout(() => { @@ -106,9 +100,9 @@ class Toast { } } - this._element.classList.remove(ClassName.HIDE) + this._element.classList.remove(CLASS_NAME_HIDE) Util.reflow(this._element) - this._element.classList.add(ClassName.SHOWING) + this._element.classList.add(CLASS_NAME_SHOWING) if (this._config.animation) { const transitionDuration = Util.getTransitionDurationFromElement(this._element) @@ -121,11 +115,11 @@ class Toast { } hide() { - if (!this._element.classList.contains(ClassName.SHOW)) { + if (!this._element.classList.contains(CLASS_NAME_SHOW)) { return } - const hideEvent = $.Event(Event.HIDE) + const hideEvent = $.Event(EVENT_HIDE) $(this._element).trigger(hideEvent) if (hideEvent.isDefaultPrevented()) { @@ -139,11 +133,11 @@ class Toast { clearTimeout(this._timeout) this._timeout = null - if (this._element.classList.contains(ClassName.SHOW)) { - this._element.classList.remove(ClassName.SHOW) + if (this._element.classList.contains(CLASS_NAME_SHOW)) { + this._element.classList.remove(CLASS_NAME_SHOW) } - $(this._element).off(Event.CLICK_DISMISS) + $(this._element).off(EVENT_CLICK_DISMISS) $.removeData(this._element, DATA_KEY) this._element = null @@ -170,19 +164,19 @@ class Toast { _setListeners() { $(this._element).on( - Event.CLICK_DISMISS, - Selector.DATA_DISMISS, + EVENT_CLICK_DISMISS, + SELECTOR_DATA_DISMISS, () => this.hide() ) } _close() { const complete = () => { - this._element.classList.add(ClassName.HIDE) - $(this._element).trigger(Event.HIDDEN) + this._element.classList.add(CLASS_NAME_HIDE) + $(this._element).trigger(EVENT_HIDDEN) } - this._element.classList.remove(ClassName.SHOW) + this._element.classList.remove(CLASS_NAME_SHOW) if (this._config.animation) { const transitionDuration = Util.getTransitionDurationFromElement(this._element) -- cgit v1.2.3