diff options
| author | Jacob Thornton <[email protected]> | 2015-11-14 19:51:50 -0800 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2015-11-14 19:51:50 -0800 |
| commit | 418f169999311d79460c1b054bdc9d68c46540b0 (patch) | |
| tree | f64017342e7954eb84ec9167eb2a8ea2b8e18402 /js/src | |
| parent | 0d34169e1f1126c0e752694905c037278402e0c8 (diff) | |
| parent | 186c1c6d8072f21c0a6ccd46097e6234f03548c8 (diff) | |
| download | bootstrap-418f169999311d79460c1b054bdc9d68c46540b0.tar.xz bootstrap-418f169999311d79460c1b054bdc9d68c46540b0.zip | |
Merge branch 'lincolndbryant-v4-dev' into v4-dev
Diffstat (limited to 'js/src')
| -rw-r--r-- | js/src/tooltip.js | 25 |
1 files changed, 7 insertions, 18 deletions
diff --git a/js/src/tooltip.js b/js/src/tooltip.js index 749e42379..30c2f7165 100644 --- a/js/src/tooltip.js +++ b/js/src/tooltip.js @@ -272,12 +272,13 @@ const Tooltip = (($) => { this._tether = new Tether({ attachment, - element : tip, - target : this.element, - classes : TetherClass, - classPrefix : CLASS_PREFIX, - offset : this.config.offset, - constraints : this.config.constraints + element : tip, + target : this.element, + classes : TetherClass, + classPrefix : CLASS_PREFIX, + offset : this.config.offset, + constraints : this.config.constraints, + addTargetClasses: false }) Util.reflow(tip) @@ -400,12 +401,6 @@ const Tooltip = (($) => { cleanupTether() { if (this._tether) { this._tether.destroy() - - // clean up after tether's junk classes - // remove after they fix issue - // (https://github.com/HubSpot/tether/issues/36) - $(this.element).removeClass(this._removeTetherClasses) - $(this.tip).removeClass(this._removeTetherClasses) } } @@ -459,12 +454,6 @@ const Tooltip = (($) => { } } - _removeTetherClasses(i, css) { - return ((css.baseVal || css).match( - new RegExp(`(^|\\s)${CLASS_PREFIX}-\\S+`, 'g')) || [] - ).join(' ') - } - _fixTitle() { let titleType = typeof this.element.getAttribute('data-original-title') if (this.element.getAttribute('title') || |