From 6d05f90591c46a612706b8200b6fc9da44062394 Mon Sep 17 00:00:00 2001 From: Erik Ziegler Date: Tue, 18 Feb 2020 11:45:19 +0100 Subject: [PATCH 1/3] fix: Stop throwing errors when calling removeToolState if toolData or toolData.data do not exist --- src/stateManagement/toolState.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/stateManagement/toolState.js b/src/stateManagement/toolState.js index dae1b4414..90d4a8942 100755 --- a/src/stateManagement/toolState.js +++ b/src/stateManagement/toolState.js @@ -80,6 +80,11 @@ function getToolState(element, toolType) { function removeToolState(element, toolType, data) { const toolStateManager = getElementToolStateManager(element); const toolData = toolStateManager.get(element, toolType); + + if (!toolData || !toolData.data || !toolData.data.length) { + return; + } + // Find this tool data let indexOfData = -1; From e905b276a0080feee7c0f33c17944eeafc16cf59 Mon Sep 17 00:00:00 2001 From: dannyrb Date: Wed, 19 Feb 2020 08:23:27 -0500 Subject: [PATCH 2/3] chore: update autofix to new vscode format --- .vscode/settings.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.vscode/settings.json b/.vscode/settings.json index 3d8051842..0b529304d 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -69,5 +69,8 @@ "[markdown]": { "editor.wordWrap": "wordWrapColumn", "editor.wordWrapColumn": 80 + }, + "editor.codeActionsOnSave": { + "source.fixAll.eslint": true } } From 2d99c7f9296a5c594aae2f738469c7f4f49b563a Mon Sep 17 00:00:00 2001 From: dannyrb Date: Wed, 19 Feb 2020 08:23:47 -0500 Subject: [PATCH 3/3] chore: apply autofix (fixes broken build) --- src/tools/OverlayTool.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/tools/OverlayTool.js b/src/tools/OverlayTool.js index b83da38f3..6831fb4c6 100644 --- a/src/tools/OverlayTool.js +++ b/src/tools/OverlayTool.js @@ -104,10 +104,12 @@ export default class OverlayTool extends BaseTool { } // Guard against non-number values - const overlayX = (!isNaN(parseFloat(overlay.x)) && isFinite(overlay.x)) ? overlay.x : 0; - const overlayY = (!isNaN(parseFloat(overlay.y)) && isFinite(overlay.y)) ? overlay.y : 0; - + const overlayX = + !isNaN(parseFloat(overlay.x)) && isFinite(overlay.x) ? overlay.x : 0; + const overlayY = + !isNaN(parseFloat(overlay.y)) && isFinite(overlay.y) ? overlay.y : 0; // Draw the overlay layer onto the canvas + canvasContext.drawImage(layerCanvas, overlayX, overlayY); }); }