diff options
| author | Jacob <[email protected]> | 2014-08-01 12:50:03 -0700 |
|---|---|---|
| committer | Jacob <[email protected]> | 2014-08-01 12:50:03 -0700 |
| commit | 8bf48121a0cfeb72f8e1553954327c120a0a4345 (patch) | |
| tree | 63027ad2d3ed096ed9b4f520da6334161a667904 /js/tooltip.js | |
| parent | 948a74662f655cb52b2867d1b2c898cdb7712c41 (diff) | |
| parent | 231744d628f4857d631e9e9e8554d0a29a1b9556 (diff) | |
| download | bootstrap-8bf48121a0cfeb72f8e1553954327c120a0a4345.tar.xz bootstrap-8bf48121a0cfeb72f8e1553954327c120a0a4345.zip | |
Merge pull request #14061 from hnrch02/fix-13656
Expose transition durations on plugin constructors; closes #13656
Diffstat (limited to 'js/tooltip.js')
| -rw-r--r-- | js/tooltip.js | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/js/tooltip.js b/js/tooltip.js index 0c3a79d0b..0758b07ee 100644 --- a/js/tooltip.js +++ b/js/tooltip.js @@ -27,6 +27,8 @@ Tooltip.VERSION = '3.2.0' + Tooltip.TRANSITION_DURATION = 150 + Tooltip.DEFAULTS = { animation: true, placement: 'top', @@ -207,7 +209,7 @@ $.support.transition && this.$tip.hasClass('fade') ? $tip .one('bsTransitionEnd', complete) - .emulateTransitionEnd(150) : + .emulateTransitionEnd(Tooltip.TRANSITION_DURATION) : complete() } } @@ -295,7 +297,7 @@ $.support.transition && this.$tip.hasClass('fade') ? $tip .one('bsTransitionEnd', complete) - .emulateTransitionEnd(150) : + .emulateTransitionEnd(Tooltip.TRANSITION_DURATION) : complete() this.hoverState = null |