From c2e5e9d92c625819505a6d7ed831fb3001df401f Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Sun, 23 Oct 2016 16:48:18 +0200 Subject: [PATCH] Merge icon and icon-raw shapes. --- src/uxbox/main/data/icons.cljs | 4 +-- src/uxbox/main/geom.cljs | 9 ------ src/uxbox/main/ui/dashboard/icons.cljs | 4 +-- src/uxbox/main/ui/shapes/group.cljs | 1 - src/uxbox/main/ui/shapes/icon.cljs | 29 ------------------- src/uxbox/main/ui/workspace/drawarea.cljs | 1 - .../main/ui/workspace/sidebar/icons.cljs | 4 +-- .../main/ui/workspace/sidebar/layers.cljs | 1 - 8 files changed, 4 insertions(+), 49 deletions(-) diff --git a/src/uxbox/main/data/icons.cljs b/src/uxbox/main/data/icons.cljs index 87f60fc28..3459f2db7 100644 --- a/src/uxbox/main/data/icons.cljs +++ b/src/uxbox/main/data/icons.cljs @@ -180,7 +180,7 @@ (defrecord IconCreated [item] rs/UpdateEvent (-apply-update [_ state] - (let [{:keys [id] :as item} (assoc item :type :icon-raw)] + (let [{:keys [id] :as item} (assoc item :type :icon)] (update state :icons-by-id assoc id item)))) (defn icon-created @@ -251,7 +251,7 @@ rs/UpdateEvent (-apply-update [_ state] (reduce (fn [state {:keys [id] :as icon}] - (let [icon (assoc icon :type :icon-raw)] + (let [icon (assoc icon :type :icon)] (assoc-in state [:icons-by-id id] icon))) state items))) diff --git a/src/uxbox/main/geom.cljs b/src/uxbox/main/geom.cljs index cae018461..b6fec34bd 100644 --- a/src/uxbox/main/geom.cljs +++ b/src/uxbox/main/geom.cljs @@ -38,7 +38,6 @@ [shape dpoint] (case (:type shape) :icon (move-rect shape dpoint) - :icon-raw (move-rect shape dpoint) :rect (move-rect shape dpoint) :text (move-rect shape dpoint) :path (move-path shape dpoint) @@ -141,7 +140,6 @@ :text (size-rect shape) :rect (size-rect shape) :icon (size-rect shape) - :icon-raw (size-rect shape) :image (size-rect shape) :path (size-rect shape))) @@ -168,7 +166,6 @@ [shape id] (case (:type shape) :icon (get-rect-vertext-point shape id) - :icon-raw (get-rect-vertext-point shape id) :rect (get-rect-vertext-point shape id) :circle (get-circle-vertext-point shape id) :text (get-rect-vertext-point shape id))) @@ -203,7 +200,6 @@ :rect (move-rect-vertex shape vid dpoint) :text (move-rect-vertex shape vid dpoint) :icon (move-rect-vertex shape vid dpoint) - :icon-raw (move-rect-vertex shape vid dpoint) :path (move-rect-vertex shape vid dpoint) :circle (move-circle-vertex shape vid dpoint))) @@ -291,7 +287,6 @@ (case (:type shape) :rect (setup-proportions-rect shape) :icon (setup-proportions-rect shape) - :icon-raw (setup-proportions-rect shape) :circle (setup-proportions-rect shape) shape)) @@ -360,7 +355,6 @@ (case (:type shape) :rect (resize-rect shape point) :icon (resize-rect shape point) - :icon-raw (resize-rect shape point) :text (resize-rect shape point) :path (resize-rect shape point) :circle (resize-circle shape point))) @@ -430,7 +424,6 @@ (case (:type shape) :rect (setup-rect shape props) :icon (setup-rect shape props) - :icon-raw (setup-rect shape props) :text (setup-rect shape props) :circle (setup-circle shape props) :group (setup-group shape props))) @@ -538,7 +531,6 @@ :rect (generic-outer-rect state shape) :text (generic-outer-rect state shape) :icon (generic-outer-rect state shape) - :icon-raw (generic-outer-rect state shape) ;; :path (generic-outer-rect state shape) :path (path-outer-rect state shape) :circle (circle-outer-rect state shape) @@ -688,7 +680,6 @@ :text (text-transformation-matrix state shape) :circle (circle-transformation-matrix state shape) :icon (icon-transformation-matrix state shape) - :icon-raw (icon-transformation-matrix state shape) :image (icon-transformation-matrix state shape) :path (path-transformation-matrix state shape) :group (group-transformation-matrix state shape)))) diff --git a/src/uxbox/main/ui/dashboard/icons.cljs b/src/uxbox/main/ui/dashboard/icons.cljs index d4f1a6b4b..36e71426e 100644 --- a/src/uxbox/main/ui/dashboard/icons.cljs +++ b/src/uxbox/main/ui/dashboard/icons.cljs @@ -275,9 +275,7 @@ :checked selected?}] [:label {:for (:id icon)}]] [:span.grid-item-image - (case (:type icon) - :icon (icon/icon-svg icon) - :icon-raw (icon/icon-raw-svg icon))] + (icon/icon-svg icon)] [:h3 (:name icon)] #_[:div.project-th-actions [:div.project-th-icon.edit i/pencil] diff --git a/src/uxbox/main/ui/shapes/group.cljs b/src/uxbox/main/ui/shapes/group.cljs index fc3342322..2a46c9acd 100644 --- a/src/uxbox/main/ui/shapes/group.cljs +++ b/src/uxbox/main/ui/shapes/group.cljs @@ -33,7 +33,6 @@ :group (group-component shape) :text (text/text-component shape) :icon (icon/icon-component shape) - :icon-raw (icon/icon-raw-component shape) :rect (rect/rect-component shape) :path (path/path-component shape) :image (image/image-component shape) diff --git a/src/uxbox/main/ui/shapes/icon.cljs b/src/uxbox/main/ui/shapes/icon.cljs index 42af6777c..79f942760 100644 --- a/src/uxbox/main/ui/shapes/icon.cljs +++ b/src/uxbox/main/ui/shapes/icon.cljs @@ -13,7 +13,6 @@ ;; --- Icon Component (declare icon-shape) -(declare icon-raw-shape) (mx/defc icon-component {:mixins [mx/static mx/reactive]} @@ -25,29 +24,9 @@ :on-mouse-down on-mouse-down} (icon-shape shape identity)])) -(mx/defc icon-raw-component - {:mixins [mx/static mx/reactive]} - [{:keys [id] :as shape}] - (let [selected (mx/react common/selected-ref) - selected? (contains? selected id) - on-mouse-down #(common/on-mouse-down % shape selected)] - [:g.shape {:class (when selected? "selected") - :on-mouse-down on-mouse-down} - (icon-raw-shape shape identity)])) - ;; --- Icon Shape (mx/defc icon-shape - {:mixins [mx/static]} - [{:keys [data id] :as shape} factory] - (let [key (str "shape-icon-" id) - rfm (geom/transformation-matrix shape) - attrs (merge {:id key :key key :transform (str rfm)} - (attrs/extract-style-attrs shape) - (attrs/make-debug-attrs shape))] - [:g attrs data])) - -(mx/defc icon-raw-shape {:mixins [mx/static]} [{:keys [x1 y1 content id metadata] :as shape} factory] (let [key (str "shape-icon-raw-" id) @@ -66,14 +45,6 @@ ;; --- Icon SVG (mx/defc icon-svg - {:mixins [mx/static]} - [{:keys [data id view-box] :as shape}] - (let [key (str "icon-svg-" id) - view-box (apply str (interpose " " view-box)) - props {:view-box view-box :id key :key key}] - [:svg props data])) - -(mx/defc icon-raw-svg {:mixins [mx/static]} [{:keys [content id metadata] :as shape}] (let [view-box (apply str (interpose " " (:view-box metadata))) diff --git a/src/uxbox/main/ui/workspace/drawarea.cljs b/src/uxbox/main/ui/workspace/drawarea.cljs index fc92207ad..060c62b71 100644 --- a/src/uxbox/main/ui/workspace/drawarea.cljs +++ b/src/uxbox/main/ui/workspace/drawarea.cljs @@ -110,7 +110,6 @@ (when-let [shape (:drawing @wb/workspace-ref)] (case (:type shape) :icon (on-init-draw-icon shape) - :icon-raw (on-init-draw-icon shape) :path (if (:free shape) (on-init-draw-free-path shape) (on-init-draw-path shape)) diff --git a/src/uxbox/main/ui/workspace/sidebar/icons.cljs b/src/uxbox/main/ui/workspace/sidebar/icons.cljs index 2afc2a128..07a508062 100644 --- a/src/uxbox/main/ui/workspace/sidebar/icons.cljs +++ b/src/uxbox/main/ui/workspace/sidebar/icons.cljs @@ -46,9 +46,7 @@ (mx/defc icon-wrapper {:mixins [mx/static]} [icon] - (case (:type icon) - :icon (icon/icon-svg icon) - :icon-raw (icon/icon-raw-svg icon))) + (icon/icon-svg icon)) (defn- icons-toolbox-will-mount [own] diff --git a/src/uxbox/main/ui/workspace/sidebar/layers.cljs b/src/uxbox/main/ui/workspace/sidebar/layers.cljs index 8f9e6b33a..5461becad 100644 --- a/src/uxbox/main/ui/workspace/sidebar/layers.cljs +++ b/src/uxbox/main/ui/workspace/sidebar/layers.cljs @@ -79,7 +79,6 @@ [item] (case (:type item) :icon (icon/icon-svg item) - :icon-raw (icon/icon-raw-svg item) :line i/line :circle i/circle :path i/curve