From f89cbb391936f0bb0c451f50096c20d674cde05d Mon Sep 17 00:00:00 2001 From: Ben Kyd Date: Fri, 2 Apr 2021 00:11:13 +0100 Subject: [PATCH] rid of redundant state --- client/public/scrabble/dragable.js | 15 ++++++--------- client/public/scrabble/pieces.js | 2 +- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/client/public/scrabble/dragable.js b/client/public/scrabble/dragable.js index 6d3edc6..c5b234f 100644 --- a/client/public/scrabble/dragable.js +++ b/client/public/scrabble/dragable.js @@ -14,7 +14,6 @@ document.querySelectorAll('piece').forEach(element => { element.addEventListener('touchstart', e => mouseDown(e, element)); }); -let state = {dx: 0, dy: 0}; let selectedElement = {}; function mouseDown(event, element) @@ -29,15 +28,13 @@ function mouseDown(event, element) if (event.type === 'touchstart') event = event.changedTouches[0]; - state.dx = Math.abs(element.offsetLeft - event.clientX); - state.dy = Math.abs(element.offsetTop - event.clientY); - element.pointerEvents = 'none'; + selectedElement = element; - // move to the centre of the mouse to simulat pickup - // selectedElement.style.top = event.clientY; - // selectedElement.style.left = event.clientX; + // move to the centre of the mouse to simulate pickup + selectedElement.style.left = `${event.clientX - 20}px`; + selectedElement.style.top = `${event.clientY - 20}px`; } function mouseMove(event) @@ -50,8 +47,8 @@ function mouseMove(event) event = event.changedTouches[0]; // TODO: Scale for % - selectedElement.style.left = `${event.clientX - state.dx}px`; - selectedElement.style.top = `${event.clientY - state.dy}px`; + selectedElement.style.left = `${event.clientX - 20}px`; + selectedElement.style.top = `${event.clientY - 20}px`; } } diff --git a/client/public/scrabble/pieces.js b/client/public/scrabble/pieces.js index f588471..6e2801a 100644 --- a/client/public/scrabble/pieces.js +++ b/client/public/scrabble/pieces.js @@ -6,7 +6,7 @@ const BOARD_H = 600; let BOARD_X = document.querySelector('#game-container').getBoundingClientRect().left + window.scrollX; let BOARD_Y = document.querySelector('#game-container').getBoundingClientRect().top + window.scrollY; -// only when in drawer +// only when in drawer, otherwise 40 const PIECE_WIDTH = 80; const PIECE_HEIGHT = 80;