rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-11-29 11:24:18 +01:00
Code Issues Actions Packages Releases Activity

Reset carousel touch delta x to prevent click transformation in swipe (#28558)

Browse Source
This commit is contained in:
Johann-S 2019-03-27 13:37:04 +01:00 committed by XhmikosR
parent c0b2f72a06
commit 8fda884ad3
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/src/carousel.js
View File

@ -245,6 +245,8 @@ class Carousel {
const direction = absDeltax / this.touchDeltaX const direction = absDeltax / this.touchDeltaX
this.touchDeltaX = 0
// swipe left // swipe left
if (direction > 0) { if (direction > 0) {
this.prev() this.prev()

6
js/tests/unit/carousel.js
View File

@ -1118,7 +1118,7 @@ $(function () {
} }
document.documentElement.ontouchstart = $.noop document.documentElement.ontouchstart = $.noop
assert.expect(3) assert.expect(4)
Simulator.setType('pointer') Simulator.setType('pointer')
var $styles = $(stylesCarousel).appendTo('head') var $styles = $(stylesCarousel).appendTo('head')
@ -1147,6 +1147,7 @@ $(function () {
assert.ok(true, 'slid event fired') assert.ok(true, 'slid event fired')
assert.ok(!$item.hasClass('active')) assert.ok(!$item.hasClass('active'))
assert.ok(spy.called) assert.ok(spy.called)
assert.strictEqual(carousel.touchDeltaX, 0)
$styles.remove() $styles.remove()
delete document.documentElement.ontouchstart delete document.documentElement.ontouchstart
done() done()
@ -1160,7 +1161,7 @@ $(function () {
}) })
QUnit.test('should allow swipeleft and call next with touch events', function (assert) { QUnit.test('should allow swipeleft and call next with touch events', function (assert) {
assert.expect(3) assert.expect(4)
clearPointerEvents() clearPointerEvents()
Simulator.setType('touch') Simulator.setType('touch')
document.documentElement.ontouchstart = $.noop document.documentElement.ontouchstart = $.noop
@ -1190,6 +1191,7 @@ $(function () {
assert.ok(true, 'slid event fired') assert.ok(true, 'slid event fired')
assert.ok(!$item.hasClass('active')) assert.ok(!$item.hasClass('active'))
assert.ok(spy.called) assert.ok(spy.called)
assert.strictEqual(carousel.touchDeltaX, 0)
restorePointerEvents() restorePointerEvents()
delete document.documentElement.ontouchstart delete document.documentElement.ontouchstart
done() done()