diff options
| author | Mark Otto <[email protected]> | 2016-10-24 14:27:52 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2016-10-24 14:27:52 -0700 |
| commit | f7f3e62c662c88d578cf83e8245853d447b2aad9 (patch) | |
| tree | bff6a0e3c05c3ff54dbc7507aa107022a5ca8772 /js/src/tooltip.js | |
| parent | 11d52ba9498990483d822a5a42d371393a110080 (diff) | |
| parent | cf5d94f6d5685c371dcb157af74a3c6b14ec8d8e (diff) | |
| download | bootstrap-f7f3e62c662c88d578cf83e8245853d447b2aad9.tar.xz bootstrap-f7f3e62c662c88d578cf83e8245853d447b2aad9.zip | |
Merge branch 'v4-dev' into v4-docs-streamlined
Diffstat (limited to 'js/src/tooltip.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 08daae2f2..e854b1bb4 100644 --- a/js/src/tooltip.js +++ b/js/src/tooltip.js @@ -14,10 +14,10 @@ const Tooltip = (($) => { /** * Check for Tether dependency - * Tether - http://github.hubspot.com/tether/ + * Tether - http://tether.io/ */ if (window.Tether === undefined) { - throw new Error('Bootstrap tooltips require Tether (http://github.hubspot.com/tether/)') + throw new Error('Bootstrap tooltips require Tether (http://tether.io/)') } @@ -38,7 +38,6 @@ const Tooltip = (($) => { const Default = { animation : true, template : '<div class="tooltip" role="tooltip">' - + '<div class="tooltip-arrow"></div>' + '<div class="tooltip-inner"></div></div>', trigger : 'hover focus', title : '', @@ -611,7 +610,7 @@ const Tooltip = (($) => { let _config = typeof config === 'object' ? config : null - if (!data && /destroy|hide/.test(config)) { + if (!data && /dispose|hide/.test(config)) { return } |