aboutsummaryrefslogtreecommitdiff
path: root/docs/dist/js/bootstrap.js
diff options
context:
space:
mode:
authorJacob Thornton <[email protected]>2015-11-14 19:51:50 -0800
committerJacob Thornton <[email protected]>2015-11-14 19:51:50 -0800
commit418f169999311d79460c1b054bdc9d68c46540b0 (patch)
treef64017342e7954eb84ec9167eb2a8ea2b8e18402 /docs/dist/js/bootstrap.js
parent0d34169e1f1126c0e752694905c037278402e0c8 (diff)
parent186c1c6d8072f21c0a6ccd46097e6234f03548c8 (diff)
downloadbootstrap-418f169999311d79460c1b054bdc9d68c46540b0.tar.xz
bootstrap-418f169999311d79460c1b054bdc9d68c46540b0.zip
Merge branch 'lincolndbryant-v4-dev' into v4-dev
Diffstat (limited to 'docs/dist/js/bootstrap.js')
-rw-r--r--docs/dist/js/bootstrap.js14
1 files changed, 2 insertions, 12 deletions
diff --git a/docs/dist/js/bootstrap.js b/docs/dist/js/bootstrap.js
index 91132418f..dc55e9989 100644
--- a/docs/dist/js/bootstrap.js
+++ b/docs/dist/js/bootstrap.js
@@ -2999,7 +2999,8 @@ var Tooltip = (function ($) {
classes: TetherClass,
classPrefix: CLASS_PREFIX,
offset: this.config.offset,
- constraints: this.config.constraints
+ constraints: this.config.constraints,
+ addTargetClasses: false
});
Util.reflow(tip);
@@ -3121,12 +3122,6 @@ var Tooltip = (function ($) {
value: function 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);
}
}
@@ -3165,11 +3160,6 @@ var Tooltip = (function ($) {
}
}
}, {
- key: '_removeTetherClasses',
- value: function _removeTetherClasses(i, css) {
- return ((css.baseVal || css).match(new RegExp('(^|\\s)' + CLASS_PREFIX + '-\\S+', 'g')) || []).join(' ');
- }
- }, {
key: '_fixTitle',
value: function _fixTitle() {
var titleType = typeof this.element.getAttribute('data-original-title');