mirror of https://github.com/twbs/bootstrap.git
rewrite carousel unit tests
This commit is contained in:
parent
747f0f4c7b
commit
62730d9afd
|
@ -34,7 +34,7 @@ const bsPlugins = {
|
||||||
SelectorEngine: path.resolve(__dirname, '../js/src/dom/selector-engine.js'),
|
SelectorEngine: path.resolve(__dirname, '../js/src/dom/selector-engine.js'),
|
||||||
Alert: path.resolve(__dirname, '../js/src/alert/alert.js'),
|
Alert: path.resolve(__dirname, '../js/src/alert/alert.js'),
|
||||||
Button: path.resolve(__dirname, '../js/src/button/button.js'),
|
Button: path.resolve(__dirname, '../js/src/button/button.js'),
|
||||||
Carousel: path.resolve(__dirname, '../js/src/carousel.js'),
|
Carousel: path.resolve(__dirname, '../js/src/carousel/carousel.js'),
|
||||||
Collapse: path.resolve(__dirname, '../js/src/collapse.js'),
|
Collapse: path.resolve(__dirname, '../js/src/collapse.js'),
|
||||||
Dropdown: path.resolve(__dirname, '../js/src/dropdown.js'),
|
Dropdown: path.resolve(__dirname, '../js/src/dropdown.js'),
|
||||||
Modal: path.resolve(__dirname, '../js/src/modal.js'),
|
Modal: path.resolve(__dirname, '../js/src/modal.js'),
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
|
|
||||||
import Alert from './src/alert/alert'
|
import Alert from './src/alert/alert'
|
||||||
import Button from './src/button/button'
|
import Button from './src/button/button'
|
||||||
import Carousel from './src/carousel'
|
import Carousel from './src/carousel/carousel'
|
||||||
import Collapse from './src/collapse'
|
import Collapse from './src/collapse'
|
||||||
import Dropdown from './src/dropdown'
|
import Dropdown from './src/dropdown'
|
||||||
import Modal from './src/modal'
|
import Modal from './src/modal'
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
|
|
||||||
import Alert from './src/alert/alert'
|
import Alert from './src/alert/alert'
|
||||||
import Button from './src/button/button'
|
import Button from './src/button/button'
|
||||||
import Carousel from './src/carousel'
|
import Carousel from './src/carousel/carousel'
|
||||||
import Collapse from './src/collapse'
|
import Collapse from './src/collapse'
|
||||||
import Dropdown from './src/dropdown'
|
import Dropdown from './src/dropdown'
|
||||||
import Modal from './src/modal'
|
import Modal from './src/modal'
|
||||||
|
|
|
@ -16,11 +16,11 @@ import {
|
||||||
reflow,
|
reflow,
|
||||||
triggerTransitionEnd,
|
triggerTransitionEnd,
|
||||||
typeCheckConfig
|
typeCheckConfig
|
||||||
} from './util/index'
|
} from '../util/index'
|
||||||
import Data from './dom/data'
|
import Data from '../dom/data'
|
||||||
import EventHandler from './dom/event-handler'
|
import EventHandler from '../dom/event-handler'
|
||||||
import Manipulator from './dom/manipulator'
|
import Manipulator from '../dom/manipulator'
|
||||||
import SelectorEngine from './dom/selector-engine'
|
import SelectorEngine from '../dom/selector-engine'
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* ------------------------------------------------------------------------
|
* ------------------------------------------------------------------------
|
||||||
|
@ -283,16 +283,12 @@ class Carousel {
|
||||||
.on(this._element, Event.MOUSELEAVE, event => this.cycle(event))
|
.on(this._element, Event.MOUSELEAVE, event => this.cycle(event))
|
||||||
}
|
}
|
||||||
|
|
||||||
if (this._config.touch) {
|
if (this._config.touch && this._touchSupported) {
|
||||||
this._addTouchEventListeners()
|
this._addTouchEventListeners()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
_addTouchEventListeners() {
|
_addTouchEventListeners() {
|
||||||
if (!this._touchSupported) {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
const start = event => {
|
const start = event => {
|
||||||
if (this._pointerEvent && PointerType[event.pointerType.toUpperCase()]) {
|
if (this._pointerEvent && PointerType[event.pointerType.toUpperCase()]) {
|
||||||
this.touchStartX = event.clientX
|
this.touchStartX = event.clientX
|
||||||
|
@ -631,7 +627,7 @@ EventHandler.on(window, Event.LOAD_DATA_API, () => {
|
||||||
* ------------------------------------------------------------------------
|
* ------------------------------------------------------------------------
|
||||||
* add .carousel to jQuery only if jQuery is present
|
* add .carousel to jQuery only if jQuery is present
|
||||||
*/
|
*/
|
||||||
|
/* istanbul ignore if */
|
||||||
if (typeof $ !== 'undefined') {
|
if (typeof $ !== 'undefined') {
|
||||||
const JQUERY_NO_CONFLICT = $.fn[NAME]
|
const JQUERY_NO_CONFLICT = $.fn[NAME]
|
||||||
$.fn[NAME] = Carousel._jQueryInterface
|
$.fn[NAME] = Carousel._jQueryInterface
|
File diff suppressed because it is too large
Load Diff
|
@ -74,7 +74,9 @@ const rollupPreprocessor = {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
let files = []
|
let files = [
|
||||||
|
'node_modules/hammer-simulator/index.js'
|
||||||
|
]
|
||||||
|
|
||||||
const conf = {
|
const conf = {
|
||||||
basePath: '../..',
|
basePath: '../..',
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue