Skip to content
GitLab
Commit 186c1c6d authored by Jacob Thornton's avatar Jacob Thornton
Browse files

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

parents 0d34169e 8b15b5a2
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 22 additions and 83 deletions
+22 -83
dist/js/bootstrap.js
+ 2
- 12
View file @ 186c1c6d
...@@ -2999,7 +2999,8 @@ var Tooltip = (function ($) { ...@@ -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 ($) { ...@@ -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 ($) { ...@@ -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() {
......
dist/js/bootstrap.min.js
+ 2
- 2
View file @ 186c1c6d
This diff is collapsed.
dist/js/umd/tooltip.js
+ 2
- 12
View file @ 186c1c6d
...@@ -267,7 +267,8 @@ ...@@ -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 @@ ...@@ -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 @@ ...@@ -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() {
......
docs/assets/js/docs.min.js
+ 1
- 1
View file @ 186c1c6d
This diff is collapsed.
docs/dist/js/bootstrap.js
+ 2
- 12
View file @ 186c1c6d
...@@ -2999,7 +2999,8 @@ var Tooltip = (function ($) { ...@@ -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 ($) { ...@@ -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 ($) { ...@@ -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() {
......
docs/dist/js/bootstrap.min.js
+ 2
- 2
View file @ 186c1c6d
This diff is collapsed.
docs/dist/js/umd/tooltip.js
+ 2
- 12
View file @ 186c1c6d
...@@ -267,7 +267,8 @@ ...@@ -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 @@ ...@@ -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 @@ ...@@ -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() {
......
js/dist/tooltip.js
+ 2
- 12
View file @ 186c1c6d
...@@ -250,7 +250,8 @@ var Tooltip = (function ($) { ...@@ -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 ($) { ...@@ -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 ($) { ...@@ -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() {
......
js/dist/tooltip.js.map
-716 bytes (-2%)
View file @ 186c1c6d
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
js/src/tooltip.js
+ 7
- 18
View file @ 186c1c6d
...@@ -272,12 +272,13 @@ const Tooltip = (($) => { ...@@ -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 = (($) => { ...@@ -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 = (($) => { ...@@ -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') ||
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment