mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-07 22:26:57 +02:00
Code Issues Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jacob Thornton
2015-11-14 19:49:48 -08:00
parent 0d34169e1f 8b15b5a262
commit 186c1c6d80
10 changed files with 23 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
js/src/tooltip.js
View File

@@ -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') ||