rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-02-06 04:08:22 +01:00
Code Issues Actions Packages Releases Activity

Merge branch 'lincolndbryant-v4-dev' into v4-dev

Browse Source
This commit is contained in:
Jacob Thornton 2015-11-14 19:51:50 -08:00
commit 418f169999
10 changed files with 23 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dist/js/bootstrap.js
View File

@ -2999,7 +2999,8 @@ var Tooltip = (function ($) {
classes: TetherClass, classes: TetherClass,
classPrefix: CLASS_PREFIX, classPrefix: CLASS_PREFIX,
offset: this.config.offset, offset: this.config.offset,
constraints: this.config.constraints constraints: this.config.constraints,
addTargetClasses: false
}); });
Util.reflow(tip); Util.reflow(tip);
@ -3121,12 +3122,6 @@ var Tooltip = (function ($) {
value: function cleanupTether() { value: function cleanupTether() {
if (this._tether) { if (this._tether) {
this._tether.destroy(); 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);
} }
} }
@ -3164,11 +3159,6 @@ var Tooltip = (function ($) {
this._fixTitle(); this._fixTitle();
} }
} }
}, {
key: '_removeTetherClasses',
value: function _removeTetherClasses(i, css) {
return ((css.baseVal || css).match(new RegExp('(^|\\s)' + CLASS_PREFIX + '-\\S+', 'g')) || []).join(' ');
}
}, { }, {
key: '_fixTitle', key: '_fixTitle',
value: function _fixTitle() { value: function _fixTitle() {

4
dist/js/bootstrap.min.js vendored
View File

File diff suppressed because one or more lines are too long

14
dist/js/umd/tooltip.js vendored
View File

@ -267,7 +267,8 @@
classes: TetherClass, classes: TetherClass,
classPrefix: CLASS_PREFIX, classPrefix: CLASS_PREFIX,
offset: this.config.offset, offset: this.config.offset,
constraints: this.config.constraints constraints: this.config.constraints,
addTargetClasses: false
}); });
_Util['default'].reflow(tip); _Util['default'].reflow(tip);
@ -389,12 +390,6 @@
value: function cleanupTether() { value: function cleanupTether() {
if (this._tether) { if (this._tether) {
this._tether.destroy(); 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);
} }
} }
@ -432,11 +427,6 @@
this._fixTitle(); this._fixTitle();
} }
} }
}, {
key: '_removeTetherClasses',
value: function _removeTetherClasses(i, css) {
return ((css.baseVal || css).match(new RegExp('(^|\\s)' + CLASS_PREFIX + '-\\S+', 'g')) || []).join(' ');
}
}, { }, {
key: '_fixTitle', key: '_fixTitle',
value: function _fixTitle() { value: function _fixTitle() {

2
docs/assets/js/docs.min.js vendored
View File

File diff suppressed because one or more lines are too long

14
docs/dist/js/bootstrap.js
View File

@ -2999,7 +2999,8 @@ var Tooltip = (function ($) {
classes: TetherClass, classes: TetherClass,
classPrefix: CLASS_PREFIX, classPrefix: CLASS_PREFIX,
offset: this.config.offset, offset: this.config.offset,
constraints: this.config.constraints constraints: this.config.constraints,
addTargetClasses: false
}); });
Util.reflow(tip); Util.reflow(tip);
@ -3121,12 +3122,6 @@ var Tooltip = (function ($) {
value: function cleanupTether() { value: function cleanupTether() {
if (this._tether) { if (this._tether) {
this._tether.destroy(); 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);
} }
} }
@ -3164,11 +3159,6 @@ var Tooltip = (function ($) {
this._fixTitle(); this._fixTitle();
} }
} }
}, {
key: '_removeTetherClasses',
value: function _removeTetherClasses(i, css) {
return ((css.baseVal || css).match(new RegExp('(^|\\s)' + CLASS_PREFIX + '-\\S+', 'g')) || []).join(' ');
}
}, { }, {
key: '_fixTitle', key: '_fixTitle',
value: function _fixTitle() { value: function _fixTitle() {

4
docs/dist/js/bootstrap.min.js vendored
View File

File diff suppressed because one or more lines are too long

14
docs/dist/js/umd/tooltip.js vendored
View File

@ -267,7 +267,8 @@
classes: TetherClass, classes: TetherClass,
classPrefix: CLASS_PREFIX, classPrefix: CLASS_PREFIX,
offset: this.config.offset, offset: this.config.offset,
constraints: this.config.constraints constraints: this.config.constraints,
addTargetClasses: false
}); });
_Util['default'].reflow(tip); _Util['default'].reflow(tip);
@ -389,12 +390,6 @@
value: function cleanupTether() { value: function cleanupTether() {
if (this._tether) { if (this._tether) {
this._tether.destroy(); 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);
} }
} }
@ -432,11 +427,6 @@
this._fixTitle(); this._fixTitle();
} }
} }
}, {
key: '_removeTetherClasses',
value: function _removeTetherClasses(i, css) {
return ((css.baseVal || css).match(new RegExp('(^|\\s)' + CLASS_PREFIX + '-\\S+', 'g')) || []).join(' ');
}
}, { }, {
key: '_fixTitle', key: '_fixTitle',
value: function _fixTitle() { value: function _fixTitle() {

14
js/dist/tooltip.js vendored
View File

@ -250,7 +250,8 @@ var Tooltip = (function ($) {
classes: TetherClass, classes: TetherClass,
classPrefix: CLASS_PREFIX, classPrefix: CLASS_PREFIX,
offset: this.config.offset, offset: this.config.offset,
constraints: this.config.constraints constraints: this.config.constraints,
addTargetClasses: false
}); });
Util.reflow(tip); Util.reflow(tip);
@ -372,12 +373,6 @@ var Tooltip = (function ($) {
value: function cleanupTether() { value: function cleanupTether() {
if (this._tether) { if (this._tether) {
this._tether.destroy(); 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(); this._fixTitle();
} }
} }
}, {
key: '_removeTetherClasses',
value: function _removeTetherClasses(i, css) {
return ((css.baseVal || css).match(new RegExp('(^|\\s)' + CLASS_PREFIX + '-\\S+', 'g')) || []).join(' ');
}
}, { }, {
key: '_fixTitle', key: '_fixTitle',
value: function _fixTitle() { value: function _fixTitle() {

2
js/dist/tooltip.js.map vendored
View File

File diff suppressed because one or more lines are too long

25
js/src/tooltip.js
View File

@ -272,12 +272,13 @@ const Tooltip = (($) => {
this._tether = new Tether({ this._tether = new Tether({
attachment, attachment,
element : tip, element : tip,
target : this.element, target : this.element,
classes : TetherClass, classes : TetherClass,
classPrefix : CLASS_PREFIX, classPrefix : CLASS_PREFIX,
offset : this.config.offset, offset : this.config.offset,
constraints : this.config.constraints constraints : this.config.constraints,
addTargetClasses: false
}) })
Util.reflow(tip) Util.reflow(tip)
@ -400,12 +401,6 @@ const Tooltip = (($) => {
cleanupTether() { cleanupTether() {
if (this._tether) { if (this._tether) {
this._tether.destroy() 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() { _fixTitle() {
let titleType = typeof this.element.getAttribute('data-original-title') let titleType = typeof this.element.getAttribute('data-original-title')
if (this.element.getAttribute('title') || if (this.element.getAttribute('title') ||