diff options
| author | Martijn Cuppens <martijn.cuppens@gmail.com> | 2018-03-13 11:59:20 +0300 |
|---|---|---|
| committer | Johann-S <johann.servoire@gmail.com> | 2018-03-13 11:59:20 +0300 |
| commit | 1fadad1c33b99b94a4a821fe5c62c8064d129424 (patch) | |
| tree | 8ea41f4bf03696e7718cc7c3e1216b7153b2fc85 /js/src/alert.js | |
| parent | 1859595cb6e1c92ba8134a7c12a087cb05f89688 (diff) | |
Variable transition durations (#25662)
Diffstat (limited to 'js/src/alert.js')
| -rw-r--r-- | js/src/alert.js | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/js/src/alert.js b/js/src/alert.js index a1f3c1cb7f..a072b2e4eb 100644 --- a/js/src/alert.js +++ b/js/src/alert.js @@ -21,7 +21,6 @@ const Alert = (($) => { const EVENT_KEY = `.${DATA_KEY}` const DATA_API_KEY = '.data-api' const JQUERY_NO_CONFLICT = $.fn[NAME] - const TRANSITION_DURATION = 150 const Selector = { DISMISS : '[data-dismiss="alert"]' @@ -109,9 +108,11 @@ const Alert = (($) => { return } + const transitionDuration = Util.getTransitionDurationFromElement(element) + $(element) .one(Util.TRANSITION_END, (event) => this._destroyElement(element, event)) - .emulateTransitionEnd(TRANSITION_DURATION) + .emulateTransitionEnd(transitionDuration) } _destroyElement(element) { |