bug fix cursor operation on gantt.

s-aska · Jul 29, 2015 · ed18c6b · ed18c6b
1 parent ab2f5fb
commit ed18c6b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git 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
@@ -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);