From 2af964ef20e4153d47f0d2e2005254d589a3cd8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Hru=C5=A1ka?= Date: Fri, 13 Oct 2017 18:13:00 +0200 Subject: [PATCH] Fixed a bug where the canvas would get transparent bg upon erase --- .../mastodon/features/ui/components/doodle_modal.js | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/app/javascript/mastodon/features/ui/components/doodle_modal.js b/app/javascript/mastodon/features/ui/components/doodle_modal.js index 7f91b848dfe..d13f9604a5e 100644 --- a/app/javascript/mastodon/features/ui/components/doodle_modal.js +++ b/app/javascript/mastodon/features/ui/components/doodle_modal.js @@ -17,10 +17,15 @@ export default class DoodleModal extends ImmutablePureComponent { handleKeyUp = (e) => { if (e.key === 'Delete' || e.key === 'Backspace') { - this.sketcher.clear(); + this.clearScreen(); } } + clearScreen () { + this.sketcher.context.fillStyle = 'white'; + this.sketcher.context.fillRect(0, 0, this.canvas.width, this.canvas.height); + } + componentDidMount () { window.addEventListener('keyup', this.handleKeyUp, false); } @@ -36,9 +41,7 @@ export default class DoodleModal extends ImmutablePureComponent { if (elem) { this.sketcher = new Atrament(elem, 500, 500, 'black'); - // pre-fill with white - this.sketcher.context.fillStyle = 'white'; - this.sketcher.context.fillRect(0, 0, elem.width, elem.height); + this.clearScreen(); // .smoothing looks good with mouse but works really poorly with a tablet this.sketcher.smoothing = false;