From ed18c6b368fb9f357b844b17961e8bdc66e33886 Mon Sep 17 00:00:00 2001 From: aska Date: Wed, 29 Jul 2015 19:22:01 +0900 Subject: [PATCH] bug fix cursor operation on gantt. --- htdocs/static/js/v4/app-support.js | 4 ++-- htdocs/static/js/v4/app-tasks-desktop.js | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/htdocs/static/js/v4/app-support.js b/htdocs/static/js/v4/app-support.js index 9d19cdc..993712b 100644 --- a/htdocs/static/js/v4/app-support.js +++ b/htdocs/static/js/v4/app-support.js @@ -52,8 +52,8 @@ app.support.cssAnimation = (app.support.transform3d || app.support.transform) && app.support.touchstart = app.support.mspointer ? 'MSPointerDown' : app.support.touch ? 'touchstart' : 'mousedown'; app.support.touchmove = app.support.mspointer ? 'MSPointerMove' : app.support.touch ? 'touchmove' : 'mousemove'; app.support.touchend = app.support.mspointer ? 'MSPointerUp' : app.support.touch ? 'touchend' : 'mouseup'; -app.support.pageX = function(e){ return e.pageX || e.changedTouches[0].pageX }; -app.support.pageY = function(e){ return e.pageY || e.changedTouches[0].pageY }; +app.support.pageX = function(e){ return e.pageX || (e.changedTouches ? e.changedTouches[0].pageX : undefined) }; +app.support.pageY = function(e){ return e.pageY || (e.changedTouches ? e.changedTouches[0].pageY : undefined) }; app.support.translate = app.support.transform3d ? function(x){ return 'translate3d(' + x + 'px, 0, 0)' } : function(x){ return 'translate(' + x + 'px, 0)' }; diff --git a/htdocs/static/js/v4/app-tasks-desktop.js b/htdocs/static/js/v4/app-tasks-desktop.js index aab06fd..1b486db 100644 --- a/htdocs/static/js/v4/app-tasks-desktop.js +++ b/htdocs/static/js/v4/app-tasks-desktop.js @@ -1043,6 +1043,10 @@ app.setup.task = function(tr){ e.preventDefault(); e.stopPropagation(); if (body.attr('data-mode') === 'gantt') { + var pageX = app.support.pageX(e); + if (pageX == undefined) { + return; + } var delta = parseInt((app.support.pageX(e) - 313) / 21) - 1; if (delta >= 0 && delta < app.data.gantt_width) { var date = app.date.add(app.data.gantt_start, delta);