mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-08 22:56:46 +02:00
Code Issues Releases Wiki 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
parent d6c1fa37bd 4f520c7ff3
commit 82875586c1
9 changed files with 12 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
js/src/carousel.js
View File

@@ -353,15 +353,10 @@ const Carousel = (($) => {
$(activeElement)
.one(Util.TRANSITION_END, () => {
$(nextElement)
.removeClass(directionalClassName)
.removeClass(direction)
.removeClass(`${directionalClassName} ${direction}`)
.addClass(ClassName.ACTIVE)
$(nextElement).addClass(ClassName.ACTIVE)
$(activeElement)
.removeClass(ClassName.ACTIVE)
.removeClass(direction)
.removeClass(directionalClassName)
$(activeElement).removeClass(`${ClassName.ACTIVE} ${direction} ${directionalClassName}`)
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.CONTENT), this._getContent())
$tip
.removeClass(ClassName.FADE)
.removeClass(ClassName.ACTIVE)
$tip.removeClass(`${ClassName.FADE} ${ClassName.ACTIVE}`)
this.cleanupTether()
}

4
js/src/tooltip.js
View File

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