1
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-09 07:06:36 +02:00

Merge branch 'v4-dev' of https://github.com/lincolndbryant/bootstrap into lincolndbryant-v4-dev

This commit is contained in:
Jacob Thornton
2015-11-14 19:49:48 -08:00
10 changed files with 23 additions and 84 deletions

14
js/dist/tooltip.js vendored
View File

@@ -250,7 +250,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);
@@ -372,12 +373,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);
}
}
@@ -415,11 +410,6 @@ var Tooltip = (function ($) {
this._fixTitle();
}
}
}, {
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() {