rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-02-21 18:54:30 +01:00
Code Issues Actions Packages Releases Activity

Merge branch 'v4-js-carousel' of https://github.com/J2TeaM/bootstrap into J2TeaM-v4-js-carousel

Browse Source
This commit is contained in:
Mark Otto 2016-11-28 13:39:56 -08:00
commit 82875586c1
9 changed files with 12 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
js/dist/carousel.js vendored
View File

@ -335,11 +335,9 @@ var Carousel = function ($) {
$(nextElement).addClass(directionalClassName); $(nextElement).addClass(directionalClassName);
$(activeElement).one(Util.TRANSITION_END, function () { $(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 + ' ' + direction + ' ' + directionalClassName);
$(activeElement).removeClass(ClassName.ACTIVE).removeClass(direction).removeClass(directionalClassName);
_this3._isSliding = false; _this3._isSliding = false;

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

File diff suppressed because one or more lines are too long

2
js/dist/popover.js vendored
View File

@ -95,7 +95,7 @@ var Popover = function ($) {
this.setElementContent($tip.find(Selector.TITLE), this.getTitle()); this.setElementContent($tip.find(Selector.TITLE), this.getTitle());
this.setElementContent($tip.find(Selector.CONTENT), this._getContent()); this.setElementContent($tip.find(Selector.CONTENT), this._getContent());
$tip.removeClass(ClassName.FADE).removeClass(ClassName.ACTIVE); $tip.removeClass(ClassName.FADE + ' ' + ClassName.ACTIVE);
this.cleanupTether(); this.cleanupTether();
}; };

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

File diff suppressed because one or more lines are too long

2
js/dist/tooltip.js vendored
View File

@ -330,7 +330,7 @@ var Tooltip = function ($) {
this.setElementContent($tip.find(Selector.TOOLTIP_INNER), this.getTitle()); this.setElementContent($tip.find(Selector.TOOLTIP_INNER), this.getTitle());
$tip.removeClass(ClassName.FADE).removeClass(ClassName.ACTIVE); $tip.removeClass(ClassName.FADE + ' ' + ClassName.ACTIVE);
this.cleanupTether(); this.cleanupTether();
}; };

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

File diff suppressed because one or more lines are too long

11
js/src/carousel.js
View File

@ -353,15 +353,10 @@ const Carousel = (($) => {
$(activeElement) $(activeElement)
.one(Util.TRANSITION_END, () => { .one(Util.TRANSITION_END, () => {
$(nextElement) $(nextElement)
.removeClass(directionalClassName) .removeClass(`${directionalClassName} ${direction}`)
.removeClass(direction) .addClass(ClassName.ACTIVE)
$(nextElement).addClass(ClassName.ACTIVE) $(activeElement).removeClass(`${ClassName.ACTIVE} ${direction} ${directionalClassName}`)
$(activeElement)
.removeClass(ClassName.ACTIVE)
.removeClass(direction)
.removeClass(directionalClassName)
this._isSliding = false this._isSliding = false

4
js/src/popover.js
View File

@ -117,9 +117,7 @@ const Popover = (($) => {
this.setElementContent($tip.find(Selector.TITLE), this.getTitle()) this.setElementContent($tip.find(Selector.TITLE), this.getTitle())
this.setElementContent($tip.find(Selector.CONTENT), this._getContent()) this.setElementContent($tip.find(Selector.CONTENT), this._getContent())
$tip $tip.removeClass(`${ClassName.FADE} ${ClassName.ACTIVE}`)
.removeClass(ClassName.FADE)
.removeClass(ClassName.ACTIVE)
this.cleanupTether() this.cleanupTether()
} }

4
js/src/tooltip.js
View File

@ -377,9 +377,7 @@ const Tooltip = (($) => {
this.setElementContent($tip.find(Selector.TOOLTIP_INNER), this.getTitle()) this.setElementContent($tip.find(Selector.TOOLTIP_INNER), this.getTitle())
$tip $tip.removeClass(`${ClassName.FADE} ${ClassName.ACTIVE}`)
.removeClass(ClassName.FADE)
.removeClass(ClassName.ACTIVE)
this.cleanupTether() this.cleanupTether()
} }