From 285b84f2e651b78ccd720f3ccfc5b9bee139ff4e Mon Sep 17 00:00:00 2001 From: Candid Dauth Date: Mon, 28 Apr 2014 15:37:38 +0200 Subject: [PATCH] Showing line while drawing --- frontend/js/ng.js | 11 ++++++++++- frontend/js/pad.js | 4 ++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/frontend/js/ng.js b/frontend/js/ng.js index b554c0a6..379938c6 100644 --- a/frontend/js/ng.js +++ b/frontend/js/ng.js @@ -312,6 +312,7 @@ var clickListener = function(pos) { if(lastPos && pos.lon == lastPos.lon && pos.lat == lastPos.lat) { $scope.closeMessage(message); + fp.mapEvents.off("mouseMove", mouseMoveListener); $scope.drawing = false; @@ -327,14 +328,22 @@ }); } else { line.points.push(pos); - line.actualPoints.push(pos); + line.actualPoints = [ ].concat(line.points, [ pos ]); // Add pos a second time so that it gets overwritten by mouseMoveListener fp.addLine(line); fp.addClickListener(clickListener); lastPos = pos; } }.fpWrapApply($scope); + var mouseMoveListener = function(e, pos) { + if(line.actualPoints.length > 0) { + line.actualPoints[line.actualPoints.length-1] = pos; + fp.addLine(line); + } + }; + fp.addClickListener(clickListener); + fp.mapEvents.on("mouseMove", mouseMoveListener); }); }; diff --git a/frontend/js/pad.js b/frontend/js/pad.js index b757c808..597856d8 100644 --- a/frontend/js/pad.js +++ b/frontend/js/pad.js @@ -108,6 +108,10 @@ var FacilPad = { }, 0); }); + fp.map.events.register("mousemove", this, function(e) { + fp.mapEvents.trigger("mouseMove", [ fp.xyToPos(e.xy) ]); + }); + callback(); }