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/tooltip.js | |
| parent | 1859595cb6e1c92ba8134a7c12a087cb05f89688 (diff) | |
Variable transition durations (#25662)
Diffstat (limited to 'js/src/tooltip.js')
| -rw-r--r-- | js/src/tooltip.js | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/js/src/tooltip.js b/js/src/tooltip.js index 861f45a86a..19a020d43d 100644 --- a/js/src/tooltip.js +++ b/js/src/tooltip.js @@ -16,13 +16,12 @@ const Tooltip = (($) => { * ------------------------------------------------------------------------ */ - const NAME = 'tooltip' - const VERSION = '4.0.0' - const DATA_KEY = 'bs.tooltip' - const EVENT_KEY = `.${DATA_KEY}` - const JQUERY_NO_CONFLICT = $.fn[NAME] - const TRANSITION_DURATION = 150 - const CLASS_PREFIX = 'bs-tooltip' + const NAME = 'tooltip' + const VERSION = '4.0.0' + const DATA_KEY = 'bs.tooltip' + const EVENT_KEY = `.${DATA_KEY}` + const JQUERY_NO_CONFLICT = $.fn[NAME] + const CLASS_PREFIX = 'bs-tooltip' const BSCLS_PREFIX_REGEX = new RegExp(`(^|\\s)${CLASS_PREFIX}\\S+`, 'g') const DefaultType = { @@ -335,9 +334,11 @@ const Tooltip = (($) => { } if (Util.supportsTransitionEnd() && $(this.tip).hasClass(ClassName.FADE)) { + const transitionDuration = Util.getTransitionDurationFromElement(this.tip) + $(this.tip) .one(Util.TRANSITION_END, complete) - .emulateTransitionEnd(Tooltip._TRANSITION_DURATION) + .emulateTransitionEnd(transitionDuration) } else { complete() } @@ -384,9 +385,11 @@ const Tooltip = (($) => { if (Util.supportsTransitionEnd() && $(this.tip).hasClass(ClassName.FADE)) { + const transitionDuration = Util.getTransitionDurationFromElement(tip) + $(tip) .one(Util.TRANSITION_END, complete) - .emulateTransitionEnd(TRANSITION_DURATION) + .emulateTransitionEnd(transitionDuration) } else { complete() } |