From e104386398fd104082229d9bddbb5e05d3c50f73 Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Fri, 19 Feb 2016 21:53:41 +0200 Subject: [PATCH] Fix race condition on points translation. This happens sometimes on first workspace load. --- src/uxbox/ui/workspace/canvas.cljs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/uxbox/ui/workspace/canvas.cljs b/src/uxbox/ui/workspace/canvas.cljs index f94186cb1b..e2c8e6c15b 100644 --- a/src/uxbox/ui/workspace/canvas.cljs +++ b/src/uxbox/ui/workspace/canvas.cljs @@ -185,12 +185,12 @@ (gpt/subtract pt brect))) (translate-point-to-canvas [pt] - (let [viewport (mx/get-ref-dom own "viewport") - canvas (dom/get-element-by-class "page-canvas" viewport) - brect (.getBoundingClientRect canvas) - brect (gpt/point (parse-int (.-left brect)) - (parse-int (.-top brect)))] - (gpt/subtract pt brect))) + (let [viewport (mx/get-ref-dom own "viewport")] + (when-let [canvas (dom/get-element-by-class "page-canvas" viewport)] + (let [brect (.getBoundingClientRect canvas) + brect (gpt/point (parse-int (.-left brect)) + (parse-int (.-top brect)))] + (gpt/subtract pt brect))))) (on-key-down [event] (when (kbd/space? event)