mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-05-27 14:46:01 +03:00
Code 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
parent 0d34169e1f 186c1c6d80
commit 418f169999
10 changed files with 23 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dist/js/bootstrap.js
+2 -12
View File
@@ -2999,7 +2999,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);
@@ -3121,12 +3122,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);
}
}
@@ -3164,11 +3159,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() {
dist/js/bootstrap.min.js
Vendored
+2 -2
View File
File diff suppressed because one or more lines are too long
dist/js/umd/tooltip.js
Vendored
+2 -12
View File
@@ -267,7 +267,8 @@
classes: TetherClass,
classPrefix: CLASS_PREFIX,
offset: this.config.offset,
constraints: this.config.constraints
constraints: this.config.constraints,
addTargetClasses: false
});
_Util['default'].reflow(tip);
@@ -389,12 +390,6 @@
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);
}
}
@@ -432,11 +427,6 @@
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() {
docs/assets/js/docs.min.js
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
docs/dist/js/bootstrap.js
+2 -12
View File
@@ -2999,7 +2999,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);
@@ -3121,12 +3122,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);
}
}
@@ -3164,11 +3159,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() {
docs/dist/js/bootstrap.min.js
Vendored
+2 -2
View File
File diff suppressed because one or more lines are too long
docs/dist/js/umd/tooltip.js
Vendored
+2 -12
View File
@@ -267,7 +267,8 @@
classes: TetherClass,
classPrefix: CLASS_PREFIX,
offset: this.config.offset,
constraints: this.config.constraints
constraints: this.config.constraints,
addTargetClasses: false
});
_Util['default'].reflow(tip);
@@ -389,12 +390,6 @@
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);
}
}
@@ -432,11 +427,6 @@
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() {
js/dist/tooltip.js
Vendored
+2 -12
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() {
js/dist/tooltip.js.map
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
js/src/tooltip.js
+7 -18
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') ||