2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-05-30 15:24:08 +03:00
This commit is contained in:
Mark Otto
2016-11-28 13:40:47 -08:00
parent 82875586c1
commit c3ffe13553
4 changed files with 12 additions and 16 deletions
+4 -6
View File
@@ -851,11 +851,9 @@ var Carousel = function ($) {
$(nextElement).addClass(directionalClassName);
$(activeElement).one(Util.TRANSITION_END, function () {
$(nextElement).removeClass(directionalClassName).removeClass(direction);
$(nextElement).removeClass(directionalClassName + ' ' + direction).addClass(ClassName.ACTIVE);
$(nextElement).addClass(ClassName.ACTIVE);
$(activeElement).removeClass(ClassName.ACTIVE).removeClass(direction).removeClass(directionalClassName);
$(activeElement).removeClass(ClassName.ACTIVE + ' ' + direction + ' ' + directionalClassName);
_this5._isSliding = false;
@@ -3017,7 +3015,7 @@ var Tooltip = function ($) {
this.setElementContent($tip.find(Selector.TOOLTIP_INNER), this.getTitle());
$tip.removeClass(ClassName.FADE).removeClass(ClassName.ACTIVE);
$tip.removeClass(ClassName.FADE + ' ' + ClassName.ACTIVE);
this.cleanupTether();
};
@@ -3376,7 +3374,7 @@ var Popover = function ($) {
this.setElementContent($tip.find(Selector.TITLE), this.getTitle());
this.setElementContent($tip.find(Selector.CONTENT), this._getContent());
$tip.removeClass(ClassName.FADE).removeClass(ClassName.ACTIVE);
$tip.removeClass(ClassName.FADE + ' ' + ClassName.ACTIVE);
this.cleanupTether();
};
+2 -2
View File
File diff suppressed because one or more lines are too long
+4 -6
View File
@@ -851,11 +851,9 @@ var Carousel = function ($) {
$(nextElement).addClass(directionalClassName);
$(activeElement).one(Util.TRANSITION_END, function () {
$(nextElement).removeClass(directionalClassName).removeClass(direction);
$(nextElement).removeClass(directionalClassName + ' ' + direction).addClass(ClassName.ACTIVE);
$(nextElement).addClass(ClassName.ACTIVE);
$(activeElement).removeClass(ClassName.ACTIVE).removeClass(direction).removeClass(directionalClassName);
$(activeElement).removeClass(ClassName.ACTIVE + ' ' + direction + ' ' + directionalClassName);
_this5._isSliding = false;
@@ -3017,7 +3015,7 @@ var Tooltip = function ($) {
this.setElementContent($tip.find(Selector.TOOLTIP_INNER), this.getTitle());
$tip.removeClass(ClassName.FADE).removeClass(ClassName.ACTIVE);
$tip.removeClass(ClassName.FADE + ' ' + ClassName.ACTIVE);
this.cleanupTether();
};
@@ -3376,7 +3374,7 @@ var Popover = function ($) {
this.setElementContent($tip.find(Selector.TITLE), this.getTitle());
this.setElementContent($tip.find(Selector.CONTENT), this._getContent());
$tip.removeClass(ClassName.FADE).removeClass(ClassName.ACTIVE);
$tip.removeClass(ClassName.FADE + ' ' + ClassName.ACTIVE);
this.cleanupTether();
};
+2 -2
View File
File diff suppressed because one or more lines are too long