From 8ff7edaab4f55b6612df3fe670aa9b9ac0984eae Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 19 Oct 2016 08:27:41 -0700 Subject: version bump to alpha 5 --- js/src/alert.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'js/src/alert.js') diff --git a/js/src/alert.js b/js/src/alert.js index cff86dcdd..a46494070 100644 --- a/js/src/alert.js +++ b/js/src/alert.js @@ -3,7 +3,7 @@ import Util from './util' /** * -------------------------------------------------------------------------- - * Bootstrap (v4.0.0-alpha.4): alert.js + * Bootstrap (v4.0.0-alpha.5): alert.js * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * -------------------------------------------------------------------------- */ @@ -18,7 +18,7 @@ const Alert = (($) => { */ const NAME = 'alert' - const VERSION = '4.0.0-alpha.4' + const VERSION = '4.0.0-alpha.5' const DATA_KEY = 'bs.alert' const EVENT_KEY = `.${DATA_KEY}` const DATA_API_KEY = '.data-api' -- cgit v1.2.3 From 9d129a43d6c24d9e60cc8fc7cfbddaaa4c586fdf Mon Sep 17 00:00:00 2001 From: Johann-S Date: Mon, 24 Oct 2016 10:57:32 +0200 Subject: Use a single class name for opened/expanded/shown state of widgets --- js/src/alert.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'js/src/alert.js') diff --git a/js/src/alert.js b/js/src/alert.js index a46494070..0456c677d 100644 --- a/js/src/alert.js +++ b/js/src/alert.js @@ -36,9 +36,9 @@ const Alert = (($) => { } const ClassName = { - ALERT : 'alert', - FADE : 'fade', - IN : 'in' + ALERT : 'alert', + FADE : 'fade', + ACTIVE : 'active' } @@ -108,7 +108,7 @@ const Alert = (($) => { } _removeElement(element) { - $(element).removeClass(ClassName.IN) + $(element).removeClass(ClassName.ACTIVE) if (!Util.supportsTransitionEnd() || !$(element).hasClass(ClassName.FADE)) { -- cgit v1.2.3 From 0974267b8c2b137d563d36c2390b4491fb1e0309 Mon Sep 17 00:00:00 2001 From: Bardi Harborow Date: Tue, 1 Nov 2016 14:32:36 +1100 Subject: Move from $.proxy to es6 arrow functions. (#21049) --- js/src/alert.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'js/src/alert.js') diff --git a/js/src/alert.js b/js/src/alert.js index 0456c677d..27411e276 100644 --- a/js/src/alert.js +++ b/js/src/alert.js @@ -117,7 +117,7 @@ const Alert = (($) => { } $(element) - .one(Util.TRANSITION_END, $.proxy(this._destroyElement, this, element)) + .one(Util.TRANSITION_END, (event) => this._destroyElement(element, event)) .emulateTransitionEnd(TRANSITION_DURATION) } -- cgit v1.2.3 From c2616fb74e6bdc0cd46a5678a2c5cffcbe422106 Mon Sep 17 00:00:00 2001 From: Bardi Harborow Date: Tue, 22 Nov 2016 01:36:00 +1100 Subject: Make JS compliant with the new ESLint rules. --- js/src/alert.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'js/src/alert.js') diff --git a/js/src/alert.js b/js/src/alert.js index 27411e276..8e5524950 100644 --- a/js/src/alert.js +++ b/js/src/alert.js @@ -67,8 +67,8 @@ const Alert = (($) => { close(element) { element = element || this._element - let rootElement = this._getRootElement(element) - let customEvent = this._triggerCloseEvent(rootElement) + const rootElement = this._getRootElement(element) + const customEvent = this._triggerCloseEvent(rootElement) if (customEvent.isDefaultPrevented()) { return @@ -86,8 +86,8 @@ const Alert = (($) => { // private _getRootElement(element) { - let selector = Util.getSelectorFromElement(element) - let parent = false + const selector = Util.getSelectorFromElement(element) + let parent = false if (selector) { parent = $(selector)[0] @@ -101,7 +101,7 @@ const Alert = (($) => { } _triggerCloseEvent(element) { - let closeEvent = $.Event(Event.CLOSE) + const closeEvent = $.Event(Event.CLOSE) $(element).trigger(closeEvent) return closeEvent @@ -133,8 +133,8 @@ const Alert = (($) => { static _jQueryInterface(config) { return this.each(function () { - let $element = $(this) - let data = $element.data(DATA_KEY) + const $element = $(this) + let data = $element.data(DATA_KEY) if (!data) { data = new Alert(this) -- cgit v1.2.3 From bf39bb3ac3d2aef4687b3cd4762015d5f218e2bc Mon Sep 17 00:00:00 2001 From: Starsam80 Date: Thu, 27 Oct 2016 16:13:17 -0600 Subject: Rename `.active` to `.show` --- js/src/alert.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'js/src/alert.js') diff --git a/js/src/alert.js b/js/src/alert.js index 8e5524950..884a5dec8 100644 --- a/js/src/alert.js +++ b/js/src/alert.js @@ -36,9 +36,9 @@ const Alert = (($) => { } const ClassName = { - ALERT : 'alert', - FADE : 'fade', - ACTIVE : 'active' + ALERT : 'alert', + FADE : 'fade', + SHOW : 'show' } @@ -108,7 +108,7 @@ const Alert = (($) => { } _removeElement(element) { - $(element).removeClass(ClassName.ACTIVE) + $(element).removeClass(ClassName.SHOW) if (!Util.supportsTransitionEnd() || !$(element).hasClass(ClassName.FADE)) { -- cgit v1.2.3