From aa06d824ee8612a357806a859b24eac0efe29016 Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Sun, 10 Apr 2016 18:03:28 +0300 Subject: [PATCH] Adapt imports to previos data api change. --- src/uxbox/ui/shapes/icon.cljs | 9 +++++---- src/uxbox/ui/shapes/text.cljs | 12 ++++++------ src/uxbox/ui/workspace/base.cljs | 16 ++++------------ src/uxbox/ui/workspace/canvas.cljs | 3 ++- src/uxbox/ui/workspace/colorpalette.cljs | 5 +++-- src/uxbox/ui/workspace/selrect.cljs | 3 ++- src/uxbox/ui/workspace/shortcuts.cljs | 13 +++++++------ src/uxbox/ui/workspace/sidebar/layers.cljs | 20 ++++++++++---------- 8 files changed, 39 insertions(+), 42 deletions(-) diff --git a/src/uxbox/ui/shapes/icon.cljs b/src/uxbox/ui/shapes/icon.cljs index 44e16f3de..654a9a90b 100644 --- a/src/uxbox/ui/shapes/icon.cljs +++ b/src/uxbox/ui/shapes/icon.cljs @@ -7,6 +7,7 @@ [uxbox.state :as st] [uxbox.shapes :as ush] [uxbox.data.workspace :as dw] + [uxbox.data.shapes :as uds] [uxbox.ui.core :as uuc] [uxbox.ui.mixins :as mx] [uxbox.ui.keyboard :as kbd] @@ -28,16 +29,16 @@ (and (not selected?) (empty? selected)) (do (dom/stop-propagation event) - (rs/emit! (dw/select-shape id)) + (rs/emit! (uds/select-shape id)) (uuc/acquire-action! "ui.shape.move")) (and (not selected?) (not (empty? selected))) (do (dom/stop-propagation event) (if (kbd/shift? event) - (rs/emit! (dw/select-shape id)) - (rs/emit! (dw/deselect-all) - (dw/select-shape id)))) + (rs/emit! (uds/select-shape id)) + (rs/emit! (uds/deselect-all) + (uds/select-shape id)))) :else (do diff --git a/src/uxbox/ui/shapes/text.cljs b/src/uxbox/ui/shapes/text.cljs index 5e882bd1b..0f58f8091 100644 --- a/src/uxbox/ui/shapes/text.cljs +++ b/src/uxbox/ui/shapes/text.cljs @@ -7,7 +7,7 @@ [uxbox.rstore :as rs] [uxbox.state :as st] [uxbox.shapes :as ush] - [uxbox.data.shapes :as ds] + [uxbox.data.shapes :as uds] [uxbox.data.workspace :as dw] [uxbox.ui.core :as uuc] [uxbox.ui.mixins :as mx] @@ -34,15 +34,15 @@ (do (dom/stop-propagation event) (uuc/acquire-action! "ui.shape.move") - (rs/emit! (dw/select-shape id))) + (rs/emit! (uds/select-shape id))) (and (not selected?) (not (empty? selected))) (do (dom/stop-propagation event) (if (kbd/shift? event) - (rs/emit! (dw/select-shape id)) - (rs/emit! (dw/deselect-all) - (dw/select-shape id)))) + (rs/emit! (uds/select-shape id)) + (rs/emit! (uds/deselect-all) + (uds/select-shape id)))) :else (do @@ -80,7 +80,7 @@ (on-input [ev] (let [content (dom/event->inner-text ev) sid (:id (first (:rum/props own)))] - (rs/emit! (ds/update-text sid {:content content}))))] + (rs/emit! (uds/update-text sid {:content content}))))] (let [dom (mx/get-ref-dom own "main") dom2 (mx/get-ref-dom own "container") key1 (events/listen dom EventType.DBLCLICK on-double-click) diff --git a/src/uxbox/ui/workspace/base.cljs b/src/uxbox/ui/workspace/base.cljs index 0ed1381b0..ffca0c1e6 100644 --- a/src/uxbox/ui/workspace/base.cljs +++ b/src/uxbox/ui/workspace/base.cljs @@ -18,9 +18,7 @@ [goog.events :as events]) (:import goog.events.EventType)) -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; Lenses -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; --- Lenses (def ^:const workspace-l (as-> (l/in [:workspace]) $ @@ -60,9 +58,7 @@ (-> (l/in [:workspace :zoom]) (l/focus-atom st/state))) -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; Scroll Stream -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; --- Scroll Stream (defonce scroll-b (rx/bus)) @@ -75,9 +71,7 @@ (defonce scroll-a (rx/to-atom scroll-s)) -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; Mouse Position Stream -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; --- Mouse Position Stream (defonce mouse-b (rx/bus)) (defonce mouse-s @@ -120,9 +114,7 @@ (rx/map coords-delta) (rx/share))) -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; Constants -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; --- Constants (def ^:const viewport-width 4000) (def ^:const viewport-height 4000) diff --git a/src/uxbox/ui/workspace/canvas.cljs b/src/uxbox/ui/workspace/canvas.cljs index 1f3fb3363..e5e382901 100644 --- a/src/uxbox/ui/workspace/canvas.cljs +++ b/src/uxbox/ui/workspace/canvas.cljs @@ -15,6 +15,7 @@ [uxbox.shapes :as sh] [uxbox.data.projects :as dp] [uxbox.data.workspace :as dw] + [uxbox.data.shapes :as uds] [uxbox.util.geom.point :as gpt] [uxbox.util.dom :as dom] [uxbox.util.data :refer (parse-int)] @@ -91,7 +92,7 @@ (letfn [(on-mouse-down [event] (dom/stop-propagation event) (when-not (empty? (:selected workspace)) - (rs/emit! (dw/deselect-all))) + (rs/emit! (uds/deselect-all))) (if-let [shape (:drawing workspace)] (uuc/acquire-action! "ui.shape.draw") (uuc/acquire-action! "ui.selrect"))) diff --git a/src/uxbox/ui/workspace/colorpalette.cljs b/src/uxbox/ui/workspace/colorpalette.cljs index ff7bab258..e9e1f2ed2 100644 --- a/src/uxbox/ui/workspace/colorpalette.cljs +++ b/src/uxbox/ui/workspace/colorpalette.cljs @@ -14,6 +14,7 @@ [uxbox.state :as st] [uxbox.library :as library] [uxbox.data.workspace :as dw] + [uxbox.data.shapes :as uds] [uxbox.util.lens :as ul] [uxbox.util.data :refer (read-string)] [uxbox.util.color :refer (hex->rgb)] @@ -48,8 +49,8 @@ [color event] (dom/prevent-default event) (if (kbd/shift? event) - (rs/emit! (dw/update-selected-shapes-stroke {:color color})) - (rs/emit! (dw/update-selected-shapes-fill {:color color})))) + (rs/emit! (uds/update-selected-shapes-stroke {:color color})) + (rs/emit! (uds/update-selected-shapes-fill {:color color})))) (defn- colorpalette-render [own] diff --git a/src/uxbox/ui/workspace/selrect.cljs b/src/uxbox/ui/workspace/selrect.cljs index 15c7b2135..00b2574c3 100644 --- a/src/uxbox/ui/workspace/selrect.cljs +++ b/src/uxbox/ui/workspace/selrect.cljs @@ -13,6 +13,7 @@ [uxbox.rstore :as rs] [uxbox.shapes :as sh] [uxbox.data.workspace :as dw] + [uxbox.data.shapes :as uds] [uxbox.ui.core :as uuc] [uxbox.ui.mixins :as mx] [uxbox.ui.workspace.base :as wb])) @@ -94,7 +95,7 @@ (on-complete [] (rs/emit! (-> (selrect->rect @position) (translate-to-canvas) - (dw/select-shapes))) + (uds/select-shapes))) (reset! position nil)) (init [] diff --git a/src/uxbox/ui/workspace/shortcuts.cljs b/src/uxbox/ui/workspace/shortcuts.cljs index 4e543be7f..9d14ac147 100644 --- a/src/uxbox/ui/workspace/shortcuts.cljs +++ b/src/uxbox/ui/workspace/shortcuts.cljs @@ -11,6 +11,7 @@ [uxbox.rstore :as rs] [uxbox.ui.lightbox :as lightbox] [uxbox.data.workspace :as dw] + [uxbox.data.shapes :as uds] [uxbox.data.history :as udh]) (:import goog.events.EventType goog.events.KeyCodes @@ -28,15 +29,15 @@ :ctrl+shift+l #(rs/emit! (dw/toggle-flag :layers)) :ctrl+0 #(rs/emit! (dw/reset-zoom)) :ctrl+r #(rs/emit! (dw/toggle-flag :ruler)) - :ctrl+d #(rs/emit! (dw/duplicate-selected)) + :ctrl+d #(rs/emit! (uds/duplicate-selected)) :ctrl+c #(rs/emit! (dw/copy-to-clipboard)) :ctrl+v #(rs/emit! (dw/paste-from-clipboard)) :ctrl+z #(rs/emit! (udh/backwards-to-previous-version)) :ctrl+shift+z #(rs/emit! (udh/forward-to-next-version)) :ctrl+shift+v #(lightbox/open! :clipboard) - :esc #(rs/emit! (dw/deselect-all)) - :backspace #(rs/emit! (dw/delete-selected)) - :delete #(rs/emit! (dw/delete-selected)) + :esc #(rs/emit! (uds/deselect-all)) + :backspace #(rs/emit! (uds/delete-selected)) + :delete #(rs/emit! (uds/delete-selected)) :shift+up #(move-selected :up :fast) :shift+down #(move-selected :down :fast) :shift+right #(move-selected :right :fast) @@ -78,8 +79,8 @@ (defn- move-selected [dir speed] (case speed - :std (rs/emit! (dw/move-selected dir 1)) - :fast (rs/emit! (dw/move-selected dir 20)))) + :std (rs/emit! (uds/move-selected dir 1)) + :fast (rs/emit! (uds/move-selected dir 20)))) ;; --- Mixin diff --git a/src/uxbox/ui/workspace/sidebar/layers.cljs b/src/uxbox/ui/workspace/sidebar/layers.cljs index a18bd65cf..f33e41617 100644 --- a/src/uxbox/ui/workspace/sidebar/layers.cljs +++ b/src/uxbox/ui/workspace/sidebar/layers.cljs @@ -49,18 +49,18 @@ nil (.-ctrlKey event) - (rs/emit! (udw/select-shape id)) + (rs/emit! (uds/select-shape id)) (> (count selected) 1) - (rs/emit! (udw/deselect-all) - (udw/select-shape id)) + (rs/emit! (uds/deselect-all) + (uds/select-shape id)) (contains? selected id) - (rs/emit! (udw/select-shape id)) + (rs/emit! (uds/select-shape id)) :else - (rs/emit! (udw/deselect-all) - (udw/select-shape id))))) + (rs/emit! (uds/deselect-all) + (uds/select-shape id))))) (defn- toggle-visibility [selected item event] @@ -71,7 +71,7 @@ (rs/emit! (uds/show-shape id)) (rs/emit! (uds/hide-shape id))) (when (contains? selected id) - (rs/emit! (udw/select-shape id))))) + (rs/emit! (uds/select-shape id))))) (defn- toggle-blocking [item event] @@ -289,9 +289,9 @@ shapes-by-id (rum/react wb/shapes-by-id-l) page (rum/react (focus-page (:page workspace))) close #(rs/emit! (udw/toggle-flag :layers)) - duplicate #(rs/emit! (udw/duplicate-selected)) - group #(rs/emit! (udw/group-selected)) - delete #(rs/emit! (udw/delete-selected)) + duplicate #(rs/emit! (uds/duplicate-selected)) + group #(rs/emit! (uds/group-selected)) + delete #(rs/emit! (uds/delete-selected)) dragel (volatile! nil)] (html [:div#layers.tool-window