From b0501824cfecc64522a9fef30ec7b52fd3ec588a Mon Sep 17 00:00:00 2001 From: Florent Chehab Date: Sat, 2 May 2020 13:05:04 +0200 Subject: [PATCH] feat(frontend): default to mouse and don't emit cursor while drawing --- src/js/main.js | 6 ++++++ src/js/whiteboard.js | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/js/main.js b/src/js/main.js index 9d693e8..ab9829b 100644 --- a/src/js/main.js +++ b/src/js/main.js @@ -77,6 +77,9 @@ function main() { whiteboardId: whiteboardId, username: btoa(myUsername), sendFunction: function (content) { + if (content.t === 'cursor') { + if (whiteboard.drawFlag) return; + } content["at"] = accessToken; signaling_socket.emit('drawToWhiteboard', content); $('#messageSentCount')[0].innerText = String(messageSentCount++); @@ -631,6 +634,9 @@ function main() { whiteboard.setDrawColor(color.rgbaString); } }); + + // on startup select mouse + shortcutFunctions.setTool_mouse(); }); //Prevent site from changing tab on drag&drop diff --git a/src/js/whiteboard.js b/src/js/whiteboard.js index 4942af1..9a40f5c 100644 --- a/src/js/whiteboard.js +++ b/src/js/whiteboard.js @@ -4,7 +4,7 @@ const whiteboard = { canvas: null, ctx: null, drawcolor: "black", - tool: "pen", + tool: "mouse", thickness: 4, prevX: null, //prev Mouse position prevY: null,