diff options
| author | Johann-S <johann.servoire@gmail.com> | 2017-05-12 22:22:12 +0300 |
|---|---|---|
| committer | Johann-S <johann.servoire@gmail.com> | 2017-05-14 12:41:19 +0300 |
| commit | c78cbb275b0c559f5c9436ee3df816e1f6195201 (patch) | |
| tree | d401eb5c12ee3fa3b08682ede98a68c76a8fdd33 /js | |
| parent | 2b403819b7faa07e9849885cd6ae672774e38553 (diff) | |
Change fallbackPlacement to flip by default for Tooltips/Popovers
Diffstat (limited to 'js')
| -rw-r--r-- | js/src/tooltip.js | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/js/src/tooltip.js b/js/src/tooltip.js index 6d3db06ab9..f447ed4ced 100644 --- a/js/src/tooltip.js +++ b/js/src/tooltip.js @@ -70,7 +70,7 @@ const Tooltip = (($) => { placement : 'top', offset : 0, container : false, - fallbackPlacement : [AttachmentMap.TOP, AttachmentMap.RIGHT, AttachmentMap.BOTTOM, AttachmentMap.LEFT] + fallbackPlacement : 'flip' } const HoverState = { @@ -334,8 +334,7 @@ const Tooltip = (($) => { $(this.tip) .one(Util.TRANSITION_END, complete) .emulateTransitionEnd(Tooltip._TRANSITION_DURATION) - } - else { + } else { complete() } } @@ -668,7 +667,7 @@ const Tooltip = (($) => { const tip = this.getTipElement() const initConfigAnimation = this.config.animation if (tip.getAttribute('x-placement') !== null) { - return; + return } $(tip).removeClass(ClassName.FADE) this.config.animation = false |