Fixed conflict.

This commit is contained in:
2019-08-08 13:47:00 +02:00
4 changed files with 25 additions and 22 deletions
+11 -10
View File
@@ -3453,7 +3453,6 @@
// stack!
const distanceToTop = this.container.y;
const distanceToBottom = this.opts.maxHeight - this.container.y - this.__initHeight;
if (distanceToTop > 0) {
throwProps.y.end = 0;
} else if (distanceToBottom > 0) {
@@ -12337,6 +12336,8 @@
}
}
/* global ThrowPropsPlugin */
class Ticks {
get reservedPrefixes() {
return ['decade', 'year', 'month', 'day', 'hour', 'minute', 'second']
@@ -12995,9 +12996,9 @@
this.killTweens();
this.deltas = [];
this.validScroll();
if (typeof ThrowPropsPlugin != 'undefined') {
ThrowPropsPlugin.track(this, 'delta');
}
// if (typeof ThrowPropsPlugin != 'undefined') {
// ThrowPropsPlugin.track(this, 'delta')
// }
}
onMove(event, interaction) {
@@ -13017,11 +13018,11 @@
}
onEnd(event, interaction) {
if (typeof ThrowPropsPlugin != 'undefined') {
let vel = ThrowPropsPlugin.getVelocity(this, 'delta');
ThrowPropsPlugin.untrack(this);
}
// if (typeof ThrowPropsPlugin != 'undefined') {
// let vel = ThrowPropsPlugin.getVelocity(this, 'delta')
// ThrowPropsPlugin.untrack(this)
// }
this.killTweens();
this.redraw();
let delta = 0;
@@ -13034,7 +13035,7 @@
this.autoScroll = true;
let anchor = interaction.current.mean();
this.keepInBounds(delta, anchor);
console.log("onEnd", delta);
for (let key of interaction.ended.keys()) {
if (interaction.isDoubleTap(key)) {
this.onDoubleTap(event, interaction, key);