diff --git a/Step/wwwroot/src/_base/gestures.js b/Step/wwwroot/src/_base/gestures.js index 5f93feb5..1063a458 100644 --- a/Step/wwwroot/src/_base/gestures.js +++ b/Step/wwwroot/src/_base/gestures.js @@ -39,10 +39,10 @@ function swipedetect(el, callback, onmovecallback, onstart, onstop) { distX = touchobj.pageX - lastXswipe; distY = touchobj.pageY - lastYswipe; - if (Math.abs(distY) >= threshold && Math.abs(distX) < restraint) { + if (Math.abs(distY) >= threshold && Math.abs(distX) < restraint && swipedir != 'left' && swipedir != 'right' ) { swipedir = (distY < 0) ? 'up' : 'down' } - if (Math.abs(distX) >= threshold && Math.abs(distY) < restraint) { + if (Math.abs(distX) >= threshold && Math.abs(distY) < restraint && swipedir != 'up' && swipedir != 'down' ) { swipedir = (distX < 0) ? 'left' : 'right' } @@ -55,8 +55,7 @@ function swipedetect(el, callback, onmovecallback, onstart, onstop) { }, false) touchsurface.addEventListener('touchend', function(e) { - var touchobj = e.changedTouches[0] - + var touchobj = e.changedTouches[0]; if (onstop) onstop(e); handleswipe(swipedir) diff --git a/Step/wwwroot/src/modules/app-footer.ts b/Step/wwwroot/src/modules/app-footer.ts index c4835276..7e2118cb 100644 --- a/Step/wwwroot/src/modules/app-footer.ts +++ b/Step/wwwroot/src/modules/app-footer.ts @@ -22,6 +22,11 @@ export default class AppFooter extends Vue { appModelActions.MainViewToggle(this.$store); } + OpenMainView(direction) { + if (direction && direction == "up" && !this.$store.isMainViewLiftedUp) + appModelActions.MainViewLiftUp(this.$store); + } + openProgram(path: string) { this.$router.push(path); appModelActions.MainViewLiftDown(this.$store); diff --git a/Step/wwwroot/src/modules/app-footer.vue b/Step/wwwroot/src/modules/app-footer.vue index 530fcd5a..2adf0599 100644 --- a/Step/wwwroot/src/modules/app-footer.vue +++ b/Step/wwwroot/src/modules/app-footer.vue @@ -1,22 +1,24 @@