From 4dd97ca8abc0d7090f06d61d195f6764abfa72f6 Mon Sep 17 00:00:00 2001
From: Andrey Antukh <niwi@niwi.nz>
Date: Mon, 29 Feb 2016 17:19:23 +0200
Subject: [PATCH] Adapt the rest of the platform for actions api changes.

Signed-off-by: Andrey Antukh <niwi@niwi.nz>
---
 src/uxbox/ui/shapes/icon.cljs               | 3 +--
 src/uxbox/ui/shapes/text.cljs               | 3 +--
 src/uxbox/ui/workspace.cljs                 | 2 ++
 src/uxbox/ui/workspace/canvas.cljs          | 3 +--
 src/uxbox/ui/workspace/canvas/draw.cljs     | 2 ++
 src/uxbox/ui/workspace/canvas/movement.cljs | 2 ++
 src/uxbox/ui/workspace/canvas/selrect.cljs  | 2 ++
 7 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/uxbox/ui/shapes/icon.cljs b/src/uxbox/ui/shapes/icon.cljs
index bf393d5c5..0be425e5c 100644
--- a/src/uxbox/ui/shapes/icon.cljs
+++ b/src/uxbox/ui/shapes/icon.cljs
@@ -63,8 +63,7 @@
     :else
     (do
       (dom/stop-propagation event)
-      (uuc/release-action! :draw/selrect)
-      (uuc/release-action! :shape/movement))))
+      (uuc/release-all-actions!))))
 
 (declare handlers)
 
diff --git a/src/uxbox/ui/shapes/text.cljs b/src/uxbox/ui/shapes/text.cljs
index 66eb9eca2..74ac12d8a 100644
--- a/src/uxbox/ui/shapes/text.cljs
+++ b/src/uxbox/ui/shapes/text.cljs
@@ -56,8 +56,7 @@
     :else
     (do
       (dom/stop-propagation event)
-      (uuc/release-action! :draw/selrect)
-      (uuc/release-action! :shape/movement))))
+      (uuc/release-all-actions!))))
 
 (defn- text-component-did-mount
   [own]
diff --git a/src/uxbox/ui/workspace.cljs b/src/uxbox/ui/workspace.cljs
index 14020481b..bb4e1f8d5 100644
--- a/src/uxbox/ui/workspace.cljs
+++ b/src/uxbox/ui/workspace.cljs
@@ -87,6 +87,7 @@
   [own]
   (letfn [(handle-scroll-interaction []
             (let [stoper (->> uuc/actions-s
+                              (rx/map :type)
                               (rx/filter #(not= % :scroll/viewport))
                               (rx/take 1))
                   local (:rum/local own)
@@ -110,6 +111,7 @@
 
   (let [el (mx/get-ref-dom own "workspace-canvas")
         sub (as-> uuc/actions-s $
+              (rx/map :type $)
               (rx/dedupe $)
               (rx/filter #(= :scroll/viewport %) $)
               (rx/on-value $ handle-scroll-interaction))]
diff --git a/src/uxbox/ui/workspace/canvas.cljs b/src/uxbox/ui/workspace/canvas.cljs
index f44e3e7fb..1d5606645 100644
--- a/src/uxbox/ui/workspace/canvas.cljs
+++ b/src/uxbox/ui/workspace/canvas.cljs
@@ -88,8 +88,7 @@
                 (uuc/acquire-action! :draw/selrect)))
             (on-mouse-up [event]
               (dom/stop-propagation event)
-              (uuc/release-action! :draw/shape)
-              (uuc/release-action! :draw/selrect))]
+              (uuc/release-all-actions!))]
       (html
        [:svg.viewport {:width uuwb/viewport-width
                        :height uuwb/viewport-height
diff --git a/src/uxbox/ui/workspace/canvas/draw.cljs b/src/uxbox/ui/workspace/canvas/draw.cljs
index dd84053e6..513a79e9e 100644
--- a/src/uxbox/ui/workspace/canvas/draw.cljs
+++ b/src/uxbox/ui/workspace/canvas/draw.cljs
@@ -52,6 +52,7 @@
               (reset! +drawing-position+ (assoc point :lock false))
 
               (let [stoper (->> uuc/actions-s
+                                (rx/map :type)
                                 (rx/filter #(not= % :shape/movement))
                                 (rx/take 1))]
                 (as-> wb/mouse-canvas-s $
@@ -87,6 +88,7 @@
                 :builtin/line (init-shape shape))))]
 
     (as-> uuc/actions-s $
+      (rx/map :type $)
       (rx/dedupe $)
       (rx/filter #(= :draw/shape %) $)
       (rx/on-value $ init))))
diff --git a/src/uxbox/ui/workspace/canvas/movement.cljs b/src/uxbox/ui/workspace/canvas/movement.cljs
index 88a7c397c..be6180b10 100644
--- a/src/uxbox/ui/workspace/canvas/movement.cljs
+++ b/src/uxbox/ui/workspace/canvas/movement.cljs
@@ -20,12 +20,14 @@
 
           (init []
             (as-> uuc/actions-s $
+              (rx/map :type $)
               (rx/filter #(not= % :shape/movement) $)
               (rx/take 1 $)
               (rx/take-until $ uuwb/mouse-delta-s)
               (rx/on-value $ on-value)))]
 
     (as-> uuc/actions-s $
+      (rx/map :type $)
       (rx/dedupe $)
       (rx/filter #(= :shape/movement %) $)
       (rx/on-value $ init))))
diff --git a/src/uxbox/ui/workspace/canvas/selrect.cljs b/src/uxbox/ui/workspace/canvas/selrect.cljs
index fcf96fe9a..fae39d403 100644
--- a/src/uxbox/ui/workspace/canvas/selrect.cljs
+++ b/src/uxbox/ui/workspace/canvas/selrect.cljs
@@ -76,6 +76,7 @@
 
           (init []
             (let [stoper (->> uuc/actions-s
+                              (rx/map :type)
                               (rx/filter #(not= % :draw/selrect))
                               (rx/take 1))
                   pos @wb/mouse-viewport-a]
@@ -86,6 +87,7 @@
                 (rx/subscribe $ on-value nil on-complete))))]
 
     (as-> uuc/actions-s $
+      (rx/map :type $)
       (rx/dedupe $)
       (rx/filter #(= :draw/selrect %) $)
       (rx/on-value $ init))))