diff options
| author | geireann <geireann.lindfield@gmail.com> | 2024-06-17 11:40:55 -0400 |
|---|---|---|
| committer | geireann <geireann.lindfield@gmail.com> | 2024-06-17 11:40:55 -0400 |
| commit | cf539fc086c27f53cec764202d3212a996113638 (patch) | |
| tree | fcdc6a9d8d06ebf67468f63e76a2daa699fd2c9e | |
| parent | 56de54fea88891b621d6298541bd0a26334b8db5 (diff) | |
updated multitoggle eraser to always toggle
| -rw-r--r-- | package-lock.json | 8 | ||||
| -rw-r--r-- | package.json | 2 | ||||
| -rw-r--r-- | src/client/views/global/globalScripts.ts | 18 |
3 files changed, 16 insertions, 12 deletions
diff --git a/package-lock.json b/package-lock.json index 85802cd19..7c531e3a6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -68,7 +68,7 @@ "body-parser": "^1.20.2", "bootstrap": "^5.3.2", "brotli": "^1.3.3", - "browndash-components": "^0.1.44", + "browndash-components": "^0.1.45", "browser-assert": "^1.2.1", "bson": "^6.2.0", "canvas": "^2.11.2", @@ -11401,9 +11401,9 @@ } }, "node_modules/browndash-components": { - "version": "0.1.44", - "resolved": "https://registry.npmjs.org/browndash-components/-/browndash-components-0.1.44.tgz", - "integrity": "sha512-+QYEHDqd3iauijdKiVA0jXGFkOMEKn+qb7Y2iG+VK0xAh8Fho3rAUoSMv6snfg+kMc1oMGhACzJa5XauTtvguQ==", + "version": "0.1.45", + "resolved": "https://registry.npmjs.org/browndash-components/-/browndash-components-0.1.45.tgz", + "integrity": "sha512-A2/3SikcA1kntY8jajwWJjnRGVRP9+DheaOMh9fAdgiQrdMZVMty+nUasbXk9HjyjkMfAUAkGvCR+SS28QL/zA==", "dependencies": { "@emotion/react": "^11.11.1", "@emotion/styled": "^11.11.0", diff --git a/package.json b/package.json index fe1ad8be7..cd5e34e86 100644 --- a/package.json +++ b/package.json @@ -153,7 +153,7 @@ "body-parser": "^1.20.2", "bootstrap": "^5.3.2", "brotli": "^1.3.3", - "browndash-components": "^0.1.44", + "browndash-components": "^0.1.45", "browser-assert": "^1.2.1", "bson": "^6.2.0", "canvas": "^2.11.2", diff --git a/src/client/views/global/globalScripts.ts b/src/client/views/global/globalScripts.ts index 7730ed385..a985986d6 100644 --- a/src/client/views/global/globalScripts.ts +++ b/src/client/views/global/globalScripts.ts @@ -450,15 +450,19 @@ function setActiveTool(tool: InkTool | Gestures, keepPrim: boolean, checkResult? GestureOverlay.Instance.InkShape = tool as Gestures; } } else if (tool) { - if ([InkTool.StrokeEraser, InkTool.RadiusEraser, InkTool.SegmentEraser].includes(tool as any)) { - Doc.UserDoc().activeEraserTool = tool; - } - // pen or eraser - if (Doc.ActiveTool === tool && !GestureOverlay.Instance.InkShape && !keepPrim) { + if (Doc.UserDoc().ActiveTool === tool) { Doc.ActiveTool = InkTool.None; } else { - Doc.ActiveTool = tool as any; - GestureOverlay.Instance.InkShape = undefined; + if ([InkTool.StrokeEraser, InkTool.RadiusEraser, InkTool.SegmentEraser].includes(tool as any)) { + Doc.UserDoc().activeEraserTool = tool; + } + // pen or eraser + if (Doc.ActiveTool === tool && !GestureOverlay.Instance.InkShape && !keepPrim) { + Doc.ActiveTool = InkTool.None; + } else { + Doc.ActiveTool = tool as any; + GestureOverlay.Instance.InkShape = undefined; + } } } else { Doc.ActiveTool = InkTool.None; |