aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBob Zeleznik <zzzman@gmail.com>2019-08-14 17:57:39 -0400
committerBob Zeleznik <zzzman@gmail.com>2019-08-14 17:57:39 -0400
commit5bc9573aae7982d6b441a79526e0f5c8b75fa62a (patch)
tree6a890ac4f5e2f2977e87bee2ba249734bf978080 /src
parente09f39a711fc109b1c80f4431efd01e6d251ab86 (diff)
parent2b0e8d271b57bf3966c11c82a55ebbd7575e059c (diff)
Merge branch 'master' of https://github.com/browngraphicslab/Dash-Web
Diffstat (limited to 'src')
-rw-r--r--src/client/views/InkingCanvas.scss3
-rw-r--r--src/client/views/InkingCanvas.tsx3
2 files changed, 4 insertions, 2 deletions
diff --git a/src/client/views/InkingCanvas.scss b/src/client/views/InkingCanvas.scss
index d95398f17..5437b26d6 100644
--- a/src/client/views/InkingCanvas.scss
+++ b/src/client/views/InkingCanvas.scss
@@ -21,8 +21,7 @@
width: 8192px;
height: 8192px;
cursor: "crosshair";
- pointer-events: auto;
-
+ pointer-events: all;
}
.inkingCanvas-canSelect,
diff --git a/src/client/views/InkingCanvas.tsx b/src/client/views/InkingCanvas.tsx
index 1cfa8d644..31ffb0f9a 100644
--- a/src/client/views/InkingCanvas.tsx
+++ b/src/client/views/InkingCanvas.tsx
@@ -68,6 +68,7 @@ export class InkingCanvas extends React.Component<InkCanvasProps> {
@action
onPointerDown = (e: React.PointerEvent): void => {
if (e.button !== 0 || e.altKey || e.ctrlKey || InkingControl.Instance.selectedTool === InkTool.None) {
+ console.log("RETURNING!");
return;
}
@@ -78,6 +79,8 @@ export class InkingCanvas extends React.Component<InkCanvasProps> {
this.previousState = new Map(this.inkData);
+ console.log("POINTER DOWN");
+
if (InkingControl.Instance.selectedTool !== InkTool.Eraser) {
// start the new line, saves a uuid to represent the field of the stroke
this._currentStrokeId = Utils.GenerateGuid();