8000 Merge branch 'lincolndbryant-v4-dev' into v4-dev · liuwenye2010/bootstrap@418f169 · GitHub
[go: up one dir, main page]
Skip to content

Commit 418f169

Browse files
fatfat
committed
Merge branch 'lincolndbryant-v4-dev' into v4-dev
2 parents 0d34169 + 186c1c6 commit 418f169

File tree

10 files changed

+23
-84
lines changed

10 files changed

+23
-84
lines changed

‎dist/js/bootstrap.js

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2999,7 +2999,8 @@ var Tooltip = (function ($) {
29992999
classes: TetherClass,
30003000
classPrefix: CLASS_PREFIX,
30013001
offset: this.config.offset,
3002-
constraints: this.config.constraints
3002+
constraints: this.config.constraints,
3003+
addTargetClasses: false
30033004
});
30043005

30053006
Util.reflow(tip);
@@ -3121,12 +3122,6 @@ var Tooltip = (function ($) {
31213122
value: function cleanupTether() {
31223123
if (this._tether) {
31233124
this._tether.destroy();
3124-
3125-
// clean up after tether's junk classes
3126-
// remove after they fix issue
3127-
// (https://github.com/HubSpot/tether/issues/36)
3128-
$(this.element).removeClass(this._removeTetherClasses);
3129-
$(this.tip).removeClass(this._removeTetherClasses);
31303125
}
31313126
}
31323127

@@ -3164,11 +3159,6 @@ var Tooltip = (function ($) {
31643159
this._fixTitle();
31653160
}
31663161
}
3167-
}, {
3168-
key: '_removeTetherClasses',
3169-
value: function _removeTetherClasses(i, css) {
3170-
return ((css.baseVal || css).match(new RegExp('(^|\\s)' + CLASS_PREFIX + '-\\S+', 'g')) || []).join(' ');
3171-
}
31723162
}, {
31733163
key: '_fixTitle',
31743164
value: function _fixTitle() {

‎dist/js/bootstrap.min.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/js/umd/tooltip.js

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,8 @@
267267
classes: TetherClass,
268268
classPrefix: CLASS_PREFIX,
269269
offset: this.config.offset,
270-
constraints: this.config.constraints
270+
constraints: this.config.constraints,
271+
addTargetClasses: false
271272
});
272273

273274
_Util['default'].reflow(tip);
@@ -389,12 +390,6 @@
389390
value: function cleanupTether() {
390391
if (this._tether) {
391392
this._tether.destroy();
392-
393-
// clean up after tether's junk classes
394-
// remove after they fix issue
395-
// (https://github.com/HubSpot/tether/issues/36)
396-
$(this.element).removeClass(this._removeTetherClasses);
397-
$(this.tip).removeClass(this._removeTetherClasses);
398393
}
399394
}
400395

@@ -432,11 +427,6 @@
432427
this._fixTitle();
433428
}
434429
}
435-
}, {
436-
key: '_removeTetherClasses',
437-
value: function _removeTetherClasses(i, css) {
438-
return ((css.baseVal || css).match(new RegExp('(^|\\s)' + CLASS_PREFIX + '-\\S+', 'g')) || []).join(' ');
439-
}
440430
}, {
441431
key: '_fixTitle',
442432
value: function _fixTitle() {

‎docs/assets/js/docs.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/dist/js/bootstrap.js

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2999,7 +2999,8 @@ var Tooltip = (function ($) {
29992999
classes: TetherClass,
30003000
classPrefix: CLASS_PREFIX,
30013001
offset: this.config.offset,
3002-
constraints: this.config.constraints
3002+
constraints: this.config.constraints,
3003+
addTargetClasses: false
30033004
});
30043005

30053006
Util.reflow(tip);
@@ -3121,12 +3122,6 @@ var Tooltip = (function ($) {
31213122
value: function cleanupTether() {
31223123
if (this._tether) {
31233124
this._tether.destroy();
3124-
3125-
// clean up after tether's junk classes
3126-
// remove after they fix issue
3127-
// (https://github.com/HubSpot/tether/issues/36)
3128-
$(this.element).removeClass(this._removeTetherClasses);
3129-
$(this.tip).removeClass(this._removeTetherClasses);
31303125
}
31313126
}
31323127

@@ -3164,11 +3159,6 @@ var Tooltip = (function ($) {
31643159
this._fixTitle();
31653160
}
31663161
}
3167-
}, {
3168-
key: '_removeTetherClasses',
3169-
value: function _removeTetherClasses(i, css) {
3170-
return ((css.baseVal || css).match(new RegExp('(^|\\s)' + CLASS_PREFIX + '-\\S+', 'g')) || []).join(' ');
3171-
}
31723162
}, {
31733163
key: '_fixTitle',
31743164
value: function _fixTitle() {

‎docs/dist/js/bootstrap.min.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/dist/js/umd/tooltip.js

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,8 @@
267267
classes: TetherClass,
268268
classPrefix: CLASS_PREFIX,
269269
offset: this.config.offset,
270-
constraints: this.config.constraints
270+
constraints: this.config.constraints,
271+
addTargetClasses: false
271272
});
272273

273274
_Util['default'].reflow(tip);
@@ -389,12 +390,6 @@
389390
value: function cleanupTether() {
390391
if (this._tether) {
391392
this._tether.destroy();
392-
393-
// clean up after tether's junk classes
394-
// remove after they fix issue
395-
// (https://github.com/HubSpot/tether/issues/36)
396-
$(this.element).removeClass(this._removeTetherClasses);
397-
$(this.tip).removeClass(this._removeTetherClasses);
398393
}
399394
}
400395

@@ -432,11 +427,6 @@
432427
this._fixTitle();
433428
}
434429
}
435-
}, {
436-
key: '_removeTetherClasses',
437-
value: function _removeTetherClasses(i, css) {
438-
return ((css.baseVal || css).match(new RegExp('(^|\\s)' + CLASS_PREFIX + '-\\S+', 'g')) || []).join(' ');
439-
}
440430
}, {
441431
key: '_fixTitle',
442432
value: function _fixTitle() {

‎js/dist/tooltip.js

Lines changed: 2 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎js/dist/tooltip.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎js/src/tooltip.js

Lines changed: 7 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -272,12 +272,13 @@ const Tooltip = (($) => {
272272

273273
this._tether = new Tether({
274274
attachment,
275-
element : tip,
276-
target : this.element,
277-
classes : TetherClass,
278-
classPrefix : CLASS_PREFIX,
279-
offset : this.config.offset,
280-
constraints : this.config.constraints
275+
element : tip,
276+
target : this.element,
277+
classes : TetherClass,
278+
classPrefix : CLASS_PREFIX,
279+
offset : this.config.offset,
280+
constraints : this.config.constraints,
281+
addTargetClasses: false
281282
})
282283

283284
Util.reflow(tip)
@@ -400,12 +401,6 @@ const Tooltip = (($) => {
400401
cleanupTether() {
401402
if (this._tether) {
402403
this._tether.destroy()
403-
404-
// clean up after tether's junk classes
405-
// remove after they fix issue
406-
// (https://github.com/HubSpot/tether/issues/36)
407-
$(this.element).removeClass(this._removeTetherClasses)
408-
$(this.tip).removeClass(this._removeTetherClasses)
409404
}
410405
}
411406

@@ -459,12 +454,6 @@ const Tooltip = (($) => {
459454
}
460455
}
461456

462-
_removeTetherClasses(i, css) {
463-
return ((css.baseVal || css).match(
464-
new RegExp(`(^|\\s)${CLASS_PREFIX}-\\S+`, 'g')) || []
465-
).join(' ')
466-
}
467-
468457
_fixTitle() {
469458
let titleType = typeof this.element.getAttribute('data-original-title')
470459
if (this.element.getAttribute('title') ||

0 commit comments

Comments
 (0)
0