mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-09-27 05:49:07 +02:00
Code Issues Releases Wiki Activity

Merge branch 'v4-dev' into carousel

Browse Source
This commit is contained in:
Mark Otto
2016-12-04 21:05:19 -08:00
parent 6782dd6e92 5a19d48705
commit 1e3ec89355
144 changed files with 2863 additions and 2399 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
js/src/carousel.js
View File

@@ -120,9 +120,10 @@ const Carousel = (($) => {
// public
next() {
if (!this._isSliding) {
this._slide(Direction.NEXT)
if (this._isSliding) {
throw new Error('Carousel is sliding')
}
this._slide(Direction.NEXT)
}
nextWhenVisible() {
@@ -133,9 +134,10 @@ const Carousel = (($) => {
}
prev() {
if (!this._isSliding) {
this._slide(Direction.PREVIOUS)
if (this._isSliding) {
throw new Error('Carousel is sliding')
}
this._slide(Direction.PREVIOUS)
}
pause(event) {
@@ -236,11 +238,10 @@ const Carousel = (($) => {
}
_keydown(event) {
event.preventDefault()
if (/input|textarea/i.test(event.target.tagName)) {
return
}
event.preventDefault()
switch (event.which) {
case ARROW_LEFT_KEYCODE:
@@ -372,15 +373,10 @@ const Carousel = (($) => {
$(activeElement)
.one(Util.TRANSITION_END, () => {
$(nextElement)
.removeClass(directionalClassName)
.removeClass(orderClassName)
.removeClass(`${directionalClassName} ${orderClassName}`)
.addClass(ClassName.ACTIVE)
$(nextElement).addClass(ClassName.ACTIVE)
$(activeElement)
.removeClass(ClassName.ACTIVE)
.removeClass(orderClassName)
.removeClass(directionalClassName)
$(activeElement).removeClass(`${ClassName.ACTIVE} ${orderClassName} ${directionalClassName}`)
this._isSliding = false