diff --git a/src/uxbox/main/library/colors.cljs b/src/uxbox/main/library/colors.cljs index 9587b5d22f..a9f83837bc 100644 --- a/src/uxbox/main/library/colors.cljs +++ b/src/uxbox/main/library/colors.cljs @@ -7,7 +7,7 @@ (ns uxbox.main.library.colors) -(def ^:static +collections+ +(def +collections+ [{:name "Generic 1" :id 1 :builtin true diff --git a/src/uxbox/main/library/images.cljs b/src/uxbox/main/library/images.cljs index e468cf6bdb..b792d2cbdc 100644 --- a/src/uxbox/main/library/images.cljs +++ b/src/uxbox/main/library/images.cljs @@ -7,7 +7,7 @@ (ns uxbox.main.library.images) -(def ^:static +collections+ +(def +collections+ [{:name "Generic 1" :id 1 :builtin true diff --git a/src/uxbox/main/state/shapes.cljs b/src/uxbox/main/state/shapes.cljs index 77f5ba7d0b..f4b4246bdf 100644 --- a/src/uxbox/main/state/shapes.cljs +++ b/src/uxbox/main/state/shapes.cljs @@ -201,8 +201,8 @@ (update-in $ [:shapes-by-id sid] dissoc :group) (clear-empty-groups $ source))))) -(def ^:static drop-after #(drop-aside %1 :after %2 %3)) -(def ^:static drop-before #(drop-aside %1 :before %2 %3)) +(def drop-after #(drop-aside %1 :after %2 %3)) +(def drop-before #(drop-aside %1 :before %2 %3)) (defn drop-inside [state tid sid] diff --git a/src/uxbox/main/ui/colorpicker.cljs b/src/uxbox/main/ui/colorpicker.cljs index 305fdaa9c5..f63450536b 100644 --- a/src/uxbox/main/ui/colorpicker.cljs +++ b/src/uxbox/main/ui/colorpicker.cljs @@ -217,7 +217,7 @@ -(def ^:static colorpicker +(def colorpicker (mx/component {:render colorpicker-render :name "colorpicker" diff --git a/src/uxbox/main/ui/dashboard/header.cljs b/src/uxbox/main/ui/dashboard/header.cljs index 5988ad1a3c..a53f0e47fb 100644 --- a/src/uxbox/main/ui/dashboard/header.cljs +++ b/src/uxbox/main/ui/dashboard/header.cljs @@ -19,7 +19,7 @@ [uxbox.main.ui.users :as ui.u] [uxbox.common.ui.mixins :as mx])) -(def ^:static header-l +(def header-l (as-> (l/in [:dashboard]) $ (l/focus-atom $ s/state))) diff --git a/src/uxbox/main/ui/dashboard/icons.cljs b/src/uxbox/main/ui/dashboard/icons.cljs index d80791812f..f185be9313 100644 --- a/src/uxbox/main/ui/dashboard/icons.cljs +++ b/src/uxbox/main/ui/dashboard/icons.cljs @@ -25,7 +25,7 @@ ;; --- Lenses -(def ^:static dashboard-l +(def dashboard-l (as-> (l/in [:dashboard]) $ (l/focus-atom $ st/state))) diff --git a/src/uxbox/main/ui/library_bar.cljs b/src/uxbox/main/ui/library_bar.cljs index e9f2c10307..98129f4ad6 100644 --- a/src/uxbox/main/ui/library_bar.cljs +++ b/src/uxbox/main/ui/library_bar.cljs @@ -77,7 +77,7 @@ ] ])) -(def ^:static library-bar +(def library-bar (mx/component {:render library-bar-render :name "library-bar" diff --git a/src/uxbox/main/ui/settings/notifications.cljs b/src/uxbox/main/ui/settings/notifications.cljs index 9ba00a4145..adb0590457 100644 --- a/src/uxbox/main/ui/settings/notifications.cljs +++ b/src/uxbox/main/ui/settings/notifications.cljs @@ -35,7 +35,7 @@ [:input.btn-primary {:type "submit" :value "Update settings"}] ]]])) -(def ^:static notifications-page +(def notifications-page (mx/component {:render notifications-page-render :name "notifications-page" diff --git a/src/uxbox/main/ui/users.cljs b/src/uxbox/main/ui/users.cljs index 5c06c1bd5d..a4648ba6db 100644 --- a/src/uxbox/main/ui/users.cljs +++ b/src/uxbox/main/ui/users.cljs @@ -50,7 +50,7 @@ ;; --- User Widget -(def ^:static profile-l +(def profile-l (as-> (l/key :profile) $ (l/focus-atom $ s/state))) diff --git a/src/uxbox/main/ui/workspace/colorpalette.cljs b/src/uxbox/main/ui/workspace/colorpalette.cljs index 9dafd730c6..8fa8b4b1c0 100644 --- a/src/uxbox/main/ui/workspace/colorpalette.cljs +++ b/src/uxbox/main/ui/workspace/colorpalette.cljs @@ -30,7 +30,7 @@ ;; TODO: move this lense under library ns. -(def ^:static ^:private collections-by-id-l +(def ^:private collections-by-id-l (-> (comp (l/in [:colors-by-id]) (ul/merge library/+color-collections-by-id+)) (l/focus-atom st/state))) @@ -90,7 +90,7 @@ [:span.close-palette {:on-click close} i/close]])))) -(def ^:static colorpalette +(def colorpalette (mx/component {:render colorpalette-render :name "colorpalette" diff --git a/src/uxbox/main/ui/workspace/ruler.cljs b/src/uxbox/main/ui/workspace/ruler.cljs index adc00ae618..49225f4532 100644 --- a/src/uxbox/main/ui/workspace/ruler.cljs +++ b/src/uxbox/main/ui/workspace/ruler.cljs @@ -149,7 +149,7 @@ (when (contains? flags :ruler) (overlay)))) -(def ^:static ruler +(def ruler (mx/component {:render ruler-render :name "ruler" diff --git a/src/uxbox/main/ui/workspace/sidebar/drawtools.cljs b/src/uxbox/main/ui/workspace/sidebar/drawtools.cljs index 41d90e7546..9474731205 100644 --- a/src/uxbox/main/ui/workspace/sidebar/drawtools.cljs +++ b/src/uxbox/main/ui/workspace/sidebar/drawtools.cljs @@ -25,7 +25,7 @@ ;; Lenses ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -(def ^:private ^:static drawing-shape +(def ^:private drawing-shape "A focused vision of the drawing property of the workspace status. This avoids rerender the whole toolbox on each workspace @@ -110,7 +110,7 @@ :on-click (partial select-for-draw (:shape props))} (:icon props)])]]))) -(def ^:static draw-toolbox +(def draw-toolbox (mx/component {:render draw-tools-render :name "draw-tools" diff --git a/src/uxbox/main/ui/workspace/sidebar/history.cljs b/src/uxbox/main/ui/workspace/sidebar/history.cljs index 20aaf40e18..15de6311dd 100644 --- a/src/uxbox/main/ui/workspace/sidebar/history.cljs +++ b/src/uxbox/main/ui/workspace/sidebar/history.cljs @@ -145,7 +145,7 @@ (history-pinned-list history) (history-list page history))]]))) -(def ^:static history-toolbox +(def history-toolbox (mx/component {:render history-toolbox-render :name "document-history-toolbox" diff --git a/src/uxbox/main/ui/workspace/sidebar/icons.cljs b/src/uxbox/main/ui/workspace/sidebar/icons.cljs index 031eb46e32..6f8a90c232 100644 --- a/src/uxbox/main/ui/workspace/sidebar/icons.cljs +++ b/src/uxbox/main/ui/workspace/sidebar/icons.cljs @@ -52,7 +52,7 @@ [own icon] (icon/icon-svg icon)) -(def ^:static ^:private icon-wrapper +(def ^:private icon-wrapper (mx/component {:render icon-wrapper-render :name "icon-wrapper" @@ -89,7 +89,7 @@ :on-click #(on-select icon)} (icon-wrapper icon)])]]))) -(def ^:static icons-toolbox +(def icons-toolbox (mx/component {:render icons-render :name "icons-toolbox" diff --git a/src/uxbox/main/ui/workspace/sidebar/layers.cljs b/src/uxbox/main/ui/workspace/sidebar/layers.cljs index b50915aba1..dd20eaa2ff 100644 --- a/src/uxbox/main/ui/workspace/sidebar/layers.cljs +++ b/src/uxbox/main/ui/workspace/sidebar/layers.cljs @@ -183,7 +183,7 @@ [:div.element-icon (element-icon item)] [:span (:name item "Unnamed")]]])))) -(def ^:static ^:private layer-element +(def ^:private layer-element (mx/component {:render layer-element-render :name "layer-element" @@ -275,7 +275,7 @@ (-> (layer-element shape selected) (rum/with-key key))))])])))) -(def ^:static ^:private layer-group +(def ^:private layer-group (mx/component {:render layer-group-render :name "layer-group" @@ -315,7 +315,7 @@ [:li.degroup-layer {:on-click degroup} i/ungroup] [:li.delete-layer {:on-click delete} i/trash]]]]))) -(def ^:static layers-toolbox +(def layers-toolbox (mx/component {:render layers-render :name "layers" diff --git a/src/uxbox/main/ui/workspace/sidebar/options.cljs b/src/uxbox/main/ui/workspace/sidebar/options.cljs index f321e0e0ae..720bbc9211 100644 --- a/src/uxbox/main/ui/workspace/sidebar/options.cljs +++ b/src/uxbox/main/ui/workspace/sidebar/options.cljs @@ -124,7 +124,7 @@ (if shape (options shape))]]]))) -(def ^:static options-toolbox +(def options-toolbox (mx/component {:render options-toolbox-render :name "options-toolbox" diff --git a/src/uxbox/main/ui/workspace/sidebar/sitemap.cljs b/src/uxbox/main/ui/workspace/sidebar/sitemap.cljs index 2a4ee124aa..d2fab4318b 100644 --- a/src/uxbox/main/ui/workspace/sidebar/sitemap.cljs +++ b/src/uxbox/main/ui/workspace/sidebar/sitemap.cljs @@ -95,7 +95,7 @@ (-> (page-item page (count pages) active?) (rum/with-key (:id page))))]]]))) -(def ^:static sitemap-toolbox +(def sitemap-toolbox (mx/component {:render sitemap-toolbox-render :name "sitemap-toolbox" diff --git a/src/uxbox/util/data.cljs b/src/uxbox/util/data.cljs index bfff820866..d274b0e612 100644 --- a/src/uxbox/util/data.cljs +++ b/src/uxbox/util/data.cljs @@ -22,7 +22,7 @@ (persistent! (reduce #(assoc! %1 (getter %2) %2) (transient {}) coll))) -(def ^:static index-by-id #(index-by % :id)) +(def index-by-id #(index-by % :id)) (defn remove-nil-vals "Given a map, return a map removing key-value