mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-12 00:24:03 +02:00
Code Issues Releases Wiki Activity

Refactor (and correct) start/move/end functions

Browse Source 
in particular, no need to use originEvent, and preventDefault() only needed for touch events
This commit is contained in:
patrickhlauke
2018-10-15 22:32:17 +01:00
committed by XhmikosR
parent 39ae077837
commit 9164f77269
1 changed files with 13 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
js/src/carousel.js
View File

@@ -278,32 +278,29 @@ class Carousel {
} }
const start = (event) => { const start = (event) => {
event.preventDefault() if (this._pointerEvent && (event.originalEvent.pointerType === PointerType.TOUCH || event.originalEvent.pointerType === PointerType.PEN)) {
const originEvent = event.originalEvent this.touchStartX = event.originalEvent.clientX
if (this._pointerEvent && (originEvent.pointerType === PointerType.TOUCH || originEvent.pointerType === PointerType.PEN)) {
this.touchStartX = originEvent.clientX
} else if (!this._pointerEvent) { } else if (!this._pointerEvent) {
this.touchStartX = originEvent.touches[0].clientX event.preventDefault()
this.touchStartX = event.originalEvent.touches[0].clientX
} }
} }
const move = (event) => { const move = (event) => {
event.preventDefault()
// ensure swiping with one touch and not pinching
if (event.originalEvent.touches && event.originalEvent.touches.length > 1) {
this.touchDeltaX = 0;
return
}
if (!this._pointerEvent) { if (!this._pointerEvent) {
this.touchDeltaX = event.originalEvent.touches[0].clientX - this.touchStartX event.preventDefault()
// ensure swiping with one touch and not pinching
if (event.originalEvent.touches && event.originalEvent.touches.length > 1) {
this.touchDeltaX = 0
} else {
this.touchDeltaX = event.originalEvent.touches[0].clientX - this.touchStartX
}
} }
} }
const end = (event) => { const end = (event) => {
if (this._pointerEvent) { if (this._pointerEvent && (event.originalEvent.pointerType === PointerType.TOUCH || event.originalEvent.pointerType === PointerType.PEN)) {
this.touchDeltaX = event.originalEvent.clientX - this.touchStartX this.touchDeltaX = event.originalEvent.clientX - this.touchStartX
} }
@@ -329,7 +326,6 @@ class Carousel {
if (this._pointerEvent) { if (this._pointerEvent) {
$(this._element).on(Event.POINTERDOWN, (event) => start(event)) $(this._element).on(Event.POINTERDOWN, (event) => start(event))
$(this._element).on(Event.POINTERUP, (event) => end(event)) $(this._element).on(Event.POINTERUP, (event) => end(event))
$(this._element).on(Event.POINTERCANCEL, (event) => end(event))
this._element.classList.add(ClassName.POINTER_EVENT) this._element.classList.add(ClassName.POINTER_EVENT)
} else { } else {