From 5dc4dec1e04ffe8f5ffa2b71b523aa0517c775c3 Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Sat, 9 Jul 2016 18:32:38 +0300 Subject: [PATCH] Replace rum/react with mx/react. --- src/uxbox/main/ui.cljs | 4 ++-- src/uxbox/main/ui/auth/recovery.cljs | 4 ++-- src/uxbox/main/ui/auth/recovery_request.cljs | 4 ++-- src/uxbox/main/ui/auth/register.cljs | 4 ++-- src/uxbox/main/ui/dashboard/colors.cljs | 14 ++++++------ src/uxbox/main/ui/dashboard/header.cljs | 2 +- src/uxbox/main/ui/dashboard/icons.cljs | 6 ++--- src/uxbox/main/ui/dashboard/images.cljs | 22 +++++++++---------- src/uxbox/main/ui/dashboard/projects.cljs | 12 +++++----- src/uxbox/main/ui/lightbox.cljs | 2 +- src/uxbox/main/ui/loader.cljs | 2 +- src/uxbox/main/ui/messages.cljs | 2 +- src/uxbox/main/ui/settings/header.cljs | 2 +- src/uxbox/main/ui/settings/password.cljs | 4 ++-- src/uxbox/main/ui/settings/profile.cljs | 8 +++---- src/uxbox/main/ui/shapes.cljs | 2 +- src/uxbox/main/ui/shapes/circle.cljs | 2 +- src/uxbox/main/ui/shapes/group.cljs | 2 +- src/uxbox/main/ui/shapes/icon.cljs | 2 +- src/uxbox/main/ui/shapes/line.cljs | 2 +- src/uxbox/main/ui/shapes/rect.cljs | 2 +- src/uxbox/main/ui/shapes/text.cljs | 2 +- src/uxbox/main/ui/users.cljs | 2 +- src/uxbox/main/ui/workspace.cljs | 2 +- src/uxbox/main/ui/workspace/canvas.cljs | 6 ++--- src/uxbox/main/ui/workspace/clipboard.cljs | 2 +- src/uxbox/main/ui/workspace/colorpalette.cljs | 4 ++-- src/uxbox/main/ui/workspace/colorpicker.cljs | 2 +- src/uxbox/main/ui/workspace/drawarea.cljs | 4 ++-- src/uxbox/main/ui/workspace/grid.cljs | 2 +- src/uxbox/main/ui/workspace/header.cljs | 8 +++---- .../main/ui/workspace/recent_colors.cljs | 2 +- src/uxbox/main/ui/workspace/ruler.cljs | 2 +- src/uxbox/main/ui/workspace/rules.cljs | 4 ++-- src/uxbox/main/ui/workspace/selection.cljs | 2 +- src/uxbox/main/ui/workspace/selrect.cljs | 2 +- src/uxbox/main/ui/workspace/settings.cljs | 6 ++--- src/uxbox/main/ui/workspace/sidebar.cljs | 4 ++-- .../main/ui/workspace/sidebar/drawtools.cljs | 4 ++-- .../main/ui/workspace/sidebar/history.cljs | 6 ++--- .../main/ui/workspace/sidebar/icons.cljs | 2 +- .../main/ui/workspace/sidebar/layers.cljs | 8 +++---- .../main/ui/workspace/sidebar/options.cljs | 2 +- .../main/ui/workspace/sidebar/sitemap.cljs | 6 ++--- src/uxbox/view/ui.cljs | 2 +- src/uxbox/view/ui/viewer.cljs | 2 +- src/uxbox/view/ui/viewer/sitemap.cljs | 6 ++--- 47 files changed, 99 insertions(+), 99 deletions(-) diff --git a/src/uxbox/main/ui.cljs b/src/uxbox/main/ui.cljs index 2bbc85ac2..74d6ffcfb 100644 --- a/src/uxbox/main/ui.cljs +++ b/src/uxbox/main/ui.cljs @@ -77,8 +77,8 @@ (defn app-render [own] - (let [route (rum/react route-l) - auth (rum/react st/auth-l) + (let [route (mx/react route-l) + auth (mx/react st/auth-l) location (:id route) params (:params route)] (if (and (restricted? location) (not auth)) diff --git a/src/uxbox/main/ui/auth/recovery.cljs b/src/uxbox/main/ui/auth/recovery.cljs index ee8724324..e6ff3586f 100644 --- a/src/uxbox/main/ui/auth/recovery.cljs +++ b/src/uxbox/main/ui/auth/recovery.cljs @@ -43,8 +43,8 @@ (defn- form-render [own token] - (let [form (rum/react form-data) - errors (rum/react form-errors) + (let [form (mx/react form-data) + errors (mx/react form-errors) valid? (us/valid? form schema)] (letfn [(on-change [field event] (let [value (dom/event->value event)] diff --git a/src/uxbox/main/ui/auth/recovery_request.cljs b/src/uxbox/main/ui/auth/recovery_request.cljs index fbe6b6490..73153b4d4 100644 --- a/src/uxbox/main/ui/auth/recovery_request.cljs +++ b/src/uxbox/main/ui/auth/recovery_request.cljs @@ -43,8 +43,8 @@ (defn- form-render [own] - (let [form (rum/react form-data) - errors (rum/react form-errors) + (let [form (mx/react form-data) + errors (mx/react form-errors) valid? (us/valid? form schema)] (letfn [(on-change [field event] (let [value (dom/event->value event)] diff --git a/src/uxbox/main/ui/auth/register.cljs b/src/uxbox/main/ui/auth/register.cljs index f8c658805..360f3caf5 100644 --- a/src/uxbox/main/ui/auth/register.cljs +++ b/src/uxbox/main/ui/auth/register.cljs @@ -40,8 +40,8 @@ (defn- register-form-render [own] - (let [form (rum/react form-data) - errors (rum/react form-errors) + (let [form (mx/react form-data) + errors (mx/react form-errors) valid? (us/valid? form uda/register-schema)] (letfn [(on-change [field event] (let [value (dom/event->value event)] diff --git a/src/uxbox/main/ui/dashboard/colors.cljs b/src/uxbox/main/ui/dashboard/colors.cljs index 287404e99..1de4ba6c0 100644 --- a/src/uxbox/main/ui/dashboard/colors.cljs +++ b/src/uxbox/main/ui/dashboard/colors.cljs @@ -50,7 +50,7 @@ (defn page-title-render [own coll] (let [local (:rum/local own) - dashboard (rum/react dashboard-l) + dashboard (mx/react dashboard-l) own? (:builtin coll false)] (letfn [(on-title-save [e] (rs/emit! (dc/rename-collection (:id coll) (:coll-name @local))) @@ -96,8 +96,8 @@ (defn nav-render [own] - (let [dashboard (rum/react dashboard-l) - collections-by-id (rum/react collections-by-id-l) + (let [dashboard (mx/react dashboard-l) + collections-by-id (mx/react collections-by-id-l) collid (:collection-id dashboard) own? (= (:collection-type dashboard) :own) builtin? (= (:collection-type dashboard) :builtin) @@ -141,11 +141,11 @@ (defn grid-render [own] (let [local (:rum/local own) - dashboard (rum/react dashboard-l) + dashboard (mx/react dashboard-l) coll-type (:collection-type dashboard) coll-id (:collection-id dashboard) own? (= coll-type :own) - coll (rum/react (focus-collection coll-id)) + coll (mx/react (focus-collection coll-id)) toggle-color-check (fn [color] (swap! local update :selected #(if (% color) (disj % color) (conj % color)))) delete-selected #(rs/emit! (dc/remove-colors (:id coll) (:selected @local)))] @@ -201,9 +201,9 @@ (defn menu-render [] - (let [dashboard (rum/react dashboard-l) + (let [dashboard (mx/react dashboard-l) coll-id (:collection-id dashboard) - coll (rum/react (focus-collection coll-id)) + coll (mx/react (focus-collection coll-id)) ccount (count (:data coll)) ] (html [:section.dashboard-bar.library-gap diff --git a/src/uxbox/main/ui/dashboard/header.cljs b/src/uxbox/main/ui/dashboard/header.cljs index 2f6fe3299..f81f51c71 100644 --- a/src/uxbox/main/ui/dashboard/header.cljs +++ b/src/uxbox/main/ui/dashboard/header.cljs @@ -31,7 +31,7 @@ (defn header-render [own] - (let [local (rum/react header-l) + (let [local (mx/react header-l) projects? (= (:section local) :dashboard/projects) elements? (= (:section local) :dashboard/elements) icons? (= (:section local) :dashboard/icons) diff --git a/src/uxbox/main/ui/dashboard/icons.cljs b/src/uxbox/main/ui/dashboard/icons.cljs index 1361d1b76..70d804af6 100644 --- a/src/uxbox/main/ui/dashboard/icons.cljs +++ b/src/uxbox/main/ui/dashboard/icons.cljs @@ -33,7 +33,7 @@ (defn- page-title-render [own coll] - (let [dashboard (rum/react dashboard-l) + (let [dashboard (mx/react dashboard-l) own? (:builtin coll false)] (html [:div.dashboard-title {} @@ -57,7 +57,7 @@ (defn nav-render [own] - (let [dashboard (rum/react dashboard-l) + (let [dashboard (mx/react dashboard-l) collid (:collection-id dashboard) own? (= (:collection-type dashboard) :own) builtin? (= (:collection-type dashboard) :builtin) @@ -98,7 +98,7 @@ (defn grid-render [own] - (let [dashboard (rum/react dashboard-l) + (let [dashboard (mx/react dashboard-l) coll-type (:collection-type dashboard) coll-id (:collection-id dashboard) own? (= coll-type :own) diff --git a/src/uxbox/main/ui/dashboard/images.cljs b/src/uxbox/main/ui/dashboard/images.cljs index 15a25b249..71a02a366 100644 --- a/src/uxbox/main/ui/dashboard/images.cljs +++ b/src/uxbox/main/ui/dashboard/images.cljs @@ -78,7 +78,7 @@ (defn page-title-render [own coll] (let [local (:rum/local own) - dashboard (rum/react dashboard-l) + dashboard (mx/react dashboard-l) own? (:builtin coll false)] (letfn [(persist [event] (let [name (:coll-name @local)] @@ -136,13 +136,13 @@ (defn nav-render [own] - (let [dashboard (rum/react dashboard-l) + (let [dashboard (mx/react dashboard-l) collid (:collection-id dashboard) own? (= (:collection-type dashboard) :own) builtin? (= (:collection-type dashboard) :builtin) collections (if builtin? (vals library/+image-collections-by-id+) - (vals (rum/react collections-by-id-l))) + (vals (mx/react collections-by-id-l))) show-builtin #(rs/emit! (di/set-collection-type :builtin)) show-own #(rs/emit! (di/set-collection-type :own)) new-coll #(rs/emit! (di/create-collection)) @@ -181,16 +181,16 @@ (defn- grid-render [own] (let [local (:rum/local own) - dashboard (rum/react dashboard-l) + dashboard (mx/react dashboard-l) coll-type (:collection-type dashboard) coll-id (:collection-id dashboard) own? (= coll-type :own) builtin? (= coll-type :builtin) coll (if builtin? (get library/+image-collections-by-id+ coll-id) - (rum/react (focus-collection coll-id))) - images-filtering (rum/react images-filtering-l) - images-ordering (rum/react images-ordering-l) + (mx/react (focus-collection coll-id))) + images-filtering (mx/react images-filtering-l) + images-ordering (mx/react images-ordering-l) images (->> (:images coll) (remove nil?) (filter-images-by images-filtering) @@ -264,7 +264,7 @@ (defn- sort-widget-render [] - (let [ordering (rum/react images-ordering-l) + (let [ordering (mx/react images-ordering-l) on-change #(rs/emit! (di/set-images-ordering (keyword (.-value (.-target %)))))] (html @@ -307,7 +307,7 @@ :on-change on-term-change :auto-focus true :placeholder (tr "ds.project-search.placeholder") - :value (rum/react images-filtering-l)}] + :value (mx/react images-filtering-l)}] [:div.clear-search {:on-click on-clear} i/close]]))) (def ^:private search-widget @@ -320,9 +320,9 @@ (defn- menu-render [] - (let [dashboard (rum/react dashboard-l) + (let [dashboard (mx/react dashboard-l) coll-id (:collection-id dashboard) - coll (rum/react (focus-collection coll-id)) + coll (mx/react (focus-collection coll-id)) icount (count (:images coll)) ] (html [:section.dashboard-bar.library-gap diff --git a/src/uxbox/main/ui/dashboard/projects.cljs b/src/uxbox/main/ui/dashboard/projects.cljs index fb59d9866..2ad17006f 100644 --- a/src/uxbox/main/ui/dashboard/projects.cljs +++ b/src/uxbox/main/ui/dashboard/projects.cljs @@ -78,7 +78,7 @@ (defn sort-widget-render [] - (let [ordering (rum/react project-ordering-l) + (let [ordering (mx/react project-ordering-l) on-change #(rs/emit! (dp/set-project-ordering (keyword (.-value (.-target %)))))] (html @@ -120,7 +120,7 @@ :on-change on-term-change :auto-focus true :placeholder (tr "ds.project-search.placeholder") - :value (rum/react project-filtering-l)}] + :value (mx/react project-filtering-l)}] [:div.clear-search {:on-click on-clear} i/close]]))) @@ -135,7 +135,7 @@ (defn menu-render [] - (let [projects (rum/react projects-by-id-l) + (let [projects (mx/react projects-by-id-l) pcount (count projects)] (html [:section.dashboard-bar @@ -190,9 +190,9 @@ (defn grid-render [own] - (let [projects (rum/react projects-by-id-l) - ordering (rum/react project-ordering-l) - filtering (rum/react project-filtering-l)] + (let [projects (mx/react projects-by-id-l) + ordering (mx/react project-ordering-l) + filtering (mx/react project-filtering-l)] (letfn [(on-click [e] (dom/prevent-default e) (udl/open! :new-project))] diff --git a/src/uxbox/main/ui/lightbox.cljs b/src/uxbox/main/ui/lightbox.cljs index 0d20fb9d7..39c2c88c6 100644 --- a/src/uxbox/main/ui/lightbox.cljs +++ b/src/uxbox/main/ui/lightbox.cljs @@ -53,7 +53,7 @@ (defn- lightbox-render [own] - (let [data (rum/react lightbox-l) + (let [data (mx/react lightbox-l) classes (classnames :hide (nil? data) :transparent (:transparent? data))] diff --git a/src/uxbox/main/ui/loader.cljs b/src/uxbox/main/ui/loader.cljs index 1add6c560..066dd47d5 100644 --- a/src/uxbox/main/ui/loader.cljs +++ b/src/uxbox/main/ui/loader.cljs @@ -26,7 +26,7 @@ (defn loader-render [own] - (when (rum/react st/loader) + (when (mx/react st/loader) (html [:div.loader-content i/loader]))) diff --git a/src/uxbox/main/ui/messages.cljs b/src/uxbox/main/ui/messages.cljs index a45d78695..6971465ef 100644 --- a/src/uxbox/main/ui/messages.cljs +++ b/src/uxbox/main/ui/messages.cljs @@ -77,7 +77,7 @@ (defn messages-render [own] - (let [message (rum/react message-l)] + (let [message (mx/react message-l)] (case (:type message) :error (notification-box message) :info (notification-box message) diff --git a/src/uxbox/main/ui/settings/header.cljs b/src/uxbox/main/ui/settings/header.cljs index 6aa8ba280..14ab8170c 100644 --- a/src/uxbox/main/ui/settings/header.cljs +++ b/src/uxbox/main/ui/settings/header.cljs @@ -31,7 +31,7 @@ (defn header-render [own] - (let [section (rum/react section-l) + (let [section (mx/react section-l) profile? (= section :settings/profile) password? (= section :settings/password) notifications? (= section :settings/notifications)] diff --git a/src/uxbox/main/ui/settings/password.cljs b/src/uxbox/main/ui/settings/password.cljs index f144041c9..a9abf1c65 100644 --- a/src/uxbox/main/ui/settings/password.cljs +++ b/src/uxbox/main/ui/settings/password.cljs @@ -39,8 +39,8 @@ (defn password-form-render [own] - (let [form (rum/react formdata) - errors (rum/react formerrors) + (let [form (mx/react formdata) + errors (mx/react formerrors) valid? (sc/valid? form udu/update-password-schema)] (letfn [(on-field-change [field event] (let [value (dom/event->value event)] diff --git a/src/uxbox/main/ui/settings/profile.cljs b/src/uxbox/main/ui/settings/profile.cljs index ec1c7e714..57c07b2ad 100644 --- a/src/uxbox/main/ui/settings/profile.cljs +++ b/src/uxbox/main/ui/settings/profile.cljs @@ -45,9 +45,9 @@ (defn profile-form-render [own] - (let [form (merge (rum/react profile-l) - (rum/react formdata)) - errors (rum/react formerrors) + (let [form (merge (mx/react profile-l) + (mx/react formdata)) + errors (mx/react formerrors) valid? (sc/valid? form udu/update-profile-schema) theme (get-in form [:metadata :theme] "light")] @@ -129,7 +129,7 @@ (first))] (rs/emit! (udu/update-photo file)) (dom/clean-value! target)))] - (let [{:keys [photo]} (rum/react profile-l) + (let [{:keys [photo]} (mx/react profile-l) photo (if (or (str/empty? photo) (nil? photo)) "images/avatar.jpg" photo)] diff --git a/src/uxbox/main/ui/shapes.cljs b/src/uxbox/main/ui/shapes.cljs index 078063483..2d95c8183 100644 --- a/src/uxbox/main/ui/shapes.cljs +++ b/src/uxbox/main/ui/shapes.cljs @@ -20,7 +20,7 @@ (defn- shape-render [own id] - (let [shape (rum/react (focus-shape id))] + (let [shape (mx/react (focus-shape id))] (when-not (:hidden shape) (render-component shape)))) diff --git a/src/uxbox/main/ui/shapes/circle.cljs b/src/uxbox/main/ui/shapes/circle.cljs index d33f31fdf..6cb4eff16 100644 --- a/src/uxbox/main/ui/shapes/circle.cljs +++ b/src/uxbox/main/ui/shapes/circle.cljs @@ -20,7 +20,7 @@ (defn- circle-component-render [own shape] (let [{:keys [id x y width height group]} shape - selected (rum/react common/selected-shapes-l) + selected (mx/react common/selected-shapes-l) selected? (contains? selected id) on-mouse-down #(common/on-mouse-down % shape selected) on-mouse-up #(common/on-mouse-up % shape)] diff --git a/src/uxbox/main/ui/shapes/group.cljs b/src/uxbox/main/ui/shapes/group.cljs index 476c60182..5898c8202 100644 --- a/src/uxbox/main/ui/shapes/group.cljs +++ b/src/uxbox/main/ui/shapes/group.cljs @@ -40,7 +40,7 @@ (defn- group-component-render [own shape] (let [{:keys [id x y width height group]} shape - selected (rum/react common/selected-shapes-l) + selected (mx/react common/selected-shapes-l) selected? (contains? selected id) on-mouse-down #(common/on-mouse-down % shape selected) on-mouse-up #(common/on-mouse-up % shape)] diff --git a/src/uxbox/main/ui/shapes/icon.cljs b/src/uxbox/main/ui/shapes/icon.cljs index e541c8b09..60a9f6145 100644 --- a/src/uxbox/main/ui/shapes/icon.cljs +++ b/src/uxbox/main/ui/shapes/icon.cljs @@ -19,7 +19,7 @@ (defn- icon-component-render [own shape] (let [{:keys [id x y width height group]} shape - selected (rum/react common/selected-shapes-l) + selected (mx/react common/selected-shapes-l) selected? (contains? selected id) on-mouse-down #(common/on-mouse-down % shape selected) on-mouse-up #(common/on-mouse-up % shape)] diff --git a/src/uxbox/main/ui/shapes/line.cljs b/src/uxbox/main/ui/shapes/line.cljs index 95f3c768a..60167e985 100644 --- a/src/uxbox/main/ui/shapes/line.cljs +++ b/src/uxbox/main/ui/shapes/line.cljs @@ -19,7 +19,7 @@ (defn- line-component-render [own shape] (let [{:keys [id x y width height group]} shape - selected (rum/react common/selected-shapes-l) + selected (mx/react common/selected-shapes-l) selected? (contains? selected id) on-mouse-down #(common/on-mouse-down % shape selected) on-mouse-up #(common/on-mouse-up % shape)] diff --git a/src/uxbox/main/ui/shapes/rect.cljs b/src/uxbox/main/ui/shapes/rect.cljs index 304bcbdd8..01c15d9fb 100644 --- a/src/uxbox/main/ui/shapes/rect.cljs +++ b/src/uxbox/main/ui/shapes/rect.cljs @@ -20,7 +20,7 @@ (defn- rect-component-render [own shape] (let [{:keys [id x y width height group]} shape - selected (rum/react common/selected-shapes-l) + selected (mx/react common/selected-shapes-l) selected? (contains? selected id) on-mouse-down #(common/on-mouse-down % shape selected) on-mouse-up #(common/on-mouse-up % shape)] diff --git a/src/uxbox/main/ui/shapes/text.cljs b/src/uxbox/main/ui/shapes/text.cljs index 6576d65cb..61da17ed6 100644 --- a/src/uxbox/main/ui/shapes/text.cljs +++ b/src/uxbox/main/ui/shapes/text.cljs @@ -39,7 +39,7 @@ (defn- text-component-render [own {:keys [id x1 y1 content group] :as shape}] - (let [selected (rum/react common/selected-shapes-l) + (let [selected (mx/react common/selected-shapes-l) selected? (and (contains? selected id) (= (count selected) 1)) local (:rum/local own)] diff --git a/src/uxbox/main/ui/users.cljs b/src/uxbox/main/ui/users.cljs index f8e646bc6..0c88c6ba9 100644 --- a/src/uxbox/main/ui/users.cljs +++ b/src/uxbox/main/ui/users.cljs @@ -56,7 +56,7 @@ (defn user-render [own] - (let [profile (rum/react profile-l) + (let [profile (mx/react profile-l) local (:rum/local own) photo (if (str/empty? (:photo profile "")) "/images/avatar.jpg" diff --git a/src/uxbox/main/ui/workspace.cljs b/src/uxbox/main/ui/workspace.cljs index 4d6c2926d..4cfdf0127 100644 --- a/src/uxbox/main/ui/workspace.cljs +++ b/src/uxbox/main/ui/workspace.cljs @@ -102,7 +102,7 @@ (defn- workspace-render [own] - (let [{:keys [flags zoom page] :as workspace} (rum/react wb/workspace-l) + (let [{:keys [flags zoom page] :as workspace} (mx/react wb/workspace-l) left-sidebar? (not (empty? (keep flags [:layers :sitemap :document-history]))) right-sidebar? (not (empty? (keep flags [:icons :drawtools diff --git a/src/uxbox/main/ui/workspace/canvas.cljs b/src/uxbox/main/ui/workspace/canvas.cljs index 9470a2240..ca1ef9c7f 100644 --- a/src/uxbox/main/ui/workspace/canvas.cljs +++ b/src/uxbox/main/ui/workspace/canvas.cljs @@ -55,7 +55,7 @@ (defn- canvas-render [own {:keys [width height id] :as page}] - (let [workspace (rum/react uuwb/workspace-l) + (let [workspace (mx/react uuwb/workspace-l) flags (:flags workspace)] (html [:svg.page-canvas {:x c/canvas-start-x @@ -84,8 +84,8 @@ (defn viewport-render [own] - (let [workspace (rum/react uuwb/workspace-l) - page (rum/react uuwb/page-l) + (let [workspace (mx/react uuwb/workspace-l) + page (mx/react uuwb/page-l) flags (:flags workspace) drawing? (:drawing workspace) zoom (or (:zoom workspace) 1)] diff --git a/src/uxbox/main/ui/workspace/clipboard.cljs b/src/uxbox/main/ui/workspace/clipboard.cljs index d8b822532..9fb5e23fe 100644 --- a/src/uxbox/main/ui/workspace/clipboard.cljs +++ b/src/uxbox/main/ui/workspace/clipboard.cljs @@ -34,7 +34,7 @@ (defn- clipboard-dialog-render [own] - (let [clipboard (rum/react clipboard-l)] + (let [clipboard (mx/react clipboard-l)] (html [:div.lightbox-body.clipboard [:div.clipboard-list diff --git a/src/uxbox/main/ui/workspace/colorpalette.cljs b/src/uxbox/main/ui/workspace/colorpalette.cljs index d181ac90d..f93d14c43 100644 --- a/src/uxbox/main/ui/workspace/colorpalette.cljs +++ b/src/uxbox/main/ui/workspace/colorpalette.cljs @@ -55,8 +55,8 @@ (defn- colorpalette-render [own] (let [local (:rum/local own) - flags (rum/react wb/flags-l) - collections-by-id (rum/react collections-by-id-l) + flags (mx/react wb/flags-l) + collections-by-id (mx/react collections-by-id-l) collections (sort-by :name (vals collections-by-id)) collection (if-let [collid (:selected @local)] (get collections-by-id collid) diff --git a/src/uxbox/main/ui/workspace/colorpicker.cljs b/src/uxbox/main/ui/workspace/colorpicker.cljs index da8d961b6..ff2342b51 100644 --- a/src/uxbox/main/ui/workspace/colorpicker.cljs +++ b/src/uxbox/main/ui/workspace/colorpicker.cljs @@ -33,7 +33,7 @@ (defn- colorpicker-render [own {:keys [x y shape attr] :as opts}] - (let [shape (rum/react (focus-shape shape)) + (let [shape (mx/react (focus-shape shape)) left (- x 260) top (- y 50)] (letfn [(change-color [color] diff --git a/src/uxbox/main/ui/workspace/drawarea.cljs b/src/uxbox/main/ui/workspace/drawarea.cljs index 132b5c38d..8c675e49c 100644 --- a/src/uxbox/main/ui/workspace/drawarea.cljs +++ b/src/uxbox/main/ui/workspace/drawarea.cljs @@ -34,8 +34,8 @@ (defn- draw-area-render [own] - (let [shape (rum/react drawing-shape) - position (rum/react drawing-position)] + (let [shape (mx/react drawing-shape) + position (mx/react drawing-position)] (when (and shape position) (-> (assoc shape :drawing? true) (geom/resize position) diff --git a/src/uxbox/main/ui/workspace/grid.cljs b/src/uxbox/main/ui/workspace/grid.cljs index a57e2b485..f312d9c18 100644 --- a/src/uxbox/main/ui/workspace/grid.cljs +++ b/src/uxbox/main/ui/workspace/grid.cljs @@ -20,7 +20,7 @@ (defn- grid-render [own] - (let [options (:options (rum/react wb/page-l)) + (let [options (:options (mx/react wb/page-l)) color (:grid/color options "#cccccc") width c/viewport-width height c/viewport-height diff --git a/src/uxbox/main/ui/workspace/header.cljs b/src/uxbox/main/ui/workspace/header.cljs index 69acc2bdd..4482eee57 100644 --- a/src/uxbox/main/ui/workspace/header.cljs +++ b/src/uxbox/main/ui/workspace/header.cljs @@ -30,8 +30,8 @@ (defn- coordenates-render [own] - (let [zoom (rum/react wb/zoom-l) - coords (some-> (rum/react wb/mouse-canvas-a) + (let [zoom (mx/react wb/zoom-l) + coords (some-> (mx/react wb/mouse-canvas-a) (gpt/divide zoom) (gpt/round 1)) increase #(rs/emit! (dw/increase-zoom)) @@ -70,8 +70,8 @@ (defn header-render [own] - (let [page (rum/react wb/page-l) - flags (rum/react wb/flags-l) + (let [page (mx/react wb/page-l) + flags (mx/react wb/flags-l) toggle #(rs/emit! (dw/toggle-flag %)) on-undo #(rs/emit! (udh/backwards-to-previous-version)) on-redo #(rs/emit! (udh/forward-to-next-version)) diff --git a/src/uxbox/main/ui/workspace/recent_colors.cljs b/src/uxbox/main/ui/workspace/recent_colors.cljs index 56959e41d..7c2c26f58 100644 --- a/src/uxbox/main/ui/workspace/recent_colors.cljs +++ b/src/uxbox/main/ui/workspace/recent_colors.cljs @@ -40,7 +40,7 @@ (defn- recent-colors-render [own {:keys [page id] :as shape} callback] - (let [shapes-by-id (rum/react wb/shapes-by-id-l) + (let [shapes-by-id (mx/react wb/shapes-by-id-l) shapes (->> (vals shapes-by-id) (filter #(= (:page %) page))) colors (calculate-colors shapes)] diff --git a/src/uxbox/main/ui/workspace/ruler.cljs b/src/uxbox/main/ui/workspace/ruler.cljs index 895daaaff..6bcc1fbe1 100644 --- a/src/uxbox/main/ui/workspace/ruler.cljs +++ b/src/uxbox/main/ui/workspace/ruler.cljs @@ -145,7 +145,7 @@ (defn- ruler-render [own] - (let [flags (rum/react wb/flags-l)] + (let [flags (mx/react wb/flags-l)] (when (contains? flags :ruler) (overlay)))) diff --git a/src/uxbox/main/ui/workspace/rules.cljs b/src/uxbox/main/ui/workspace/rules.cljs index c82927434..ad82e4607 100644 --- a/src/uxbox/main/ui/workspace/rules.cljs +++ b/src/uxbox/main/ui/workspace/rules.cljs @@ -144,7 +144,7 @@ (defn horizontal-rule-render [own zoom] - (let [scroll (rum/react wb/scroll-a) + (let [scroll (mx/react wb/scroll-a) scroll-x (:x scroll) translate-x (- (- c/canvas-scroll-padding) (:x scroll))] (html @@ -164,7 +164,7 @@ (defn vertical-rule-render [own zoom] - (let [scroll (rum/react wb/scroll-a) + (let [scroll (mx/react wb/scroll-a) scroll-y (:y scroll) translate-y (- (- c/canvas-scroll-padding) (:y scroll))] (html diff --git a/src/uxbox/main/ui/workspace/selection.cljs b/src/uxbox/main/ui/workspace/selection.cljs index d81a79c06..4aa59cb1a 100644 --- a/src/uxbox/main/ui/workspace/selection.cljs +++ b/src/uxbox/main/ui/workspace/selection.cljs @@ -112,7 +112,7 @@ (defn selection-handlers-render [own] - (let [shapes (rum/react selected-shapes-l) + (let [shapes (mx/react selected-shapes-l) shapes-num (count shapes)] (cond (> shapes-num 1) (multiple-selection-handlers-render shapes) diff --git a/src/uxbox/main/ui/workspace/selrect.cljs b/src/uxbox/main/ui/workspace/selrect.cljs index c661ab55e..e7c5ac31e 100644 --- a/src/uxbox/main/ui/workspace/selrect.cljs +++ b/src/uxbox/main/ui/workspace/selrect.cljs @@ -27,7 +27,7 @@ (defn- selrect-render [own] - (when-let [data (rum/react position)] + (when-let [data (mx/react position)] (let [{:keys [x y width height]} (selrect->rect data)] (html [:rect.selection-rect diff --git a/src/uxbox/main/ui/workspace/settings.cljs b/src/uxbox/main/ui/workspace/settings.cljs index c76341c30..9f44aaff5 100644 --- a/src/uxbox/main/ui/workspace/settings.cljs +++ b/src/uxbox/main/ui/workspace/settings.cljs @@ -41,11 +41,11 @@ (defn- settings-form-render [own] - (let [page (rum/react wb/page-l) + (let [page (mx/react wb/page-l) form (merge settings-form-defaults (:options page) - (rum/react formdata)) - errors (rum/react formerrors)] + (mx/react formdata)) + errors (mx/react formerrors)] (letfn [(on-field-change [field event] (let [value (dom/event->value event) value (parse-int value "")] diff --git a/src/uxbox/main/ui/workspace/sidebar.cljs b/src/uxbox/main/ui/workspace/sidebar.cljs index b8ae99d19..f68168999 100644 --- a/src/uxbox/main/ui/workspace/sidebar.cljs +++ b/src/uxbox/main/ui/workspace/sidebar.cljs @@ -27,7 +27,7 @@ (defn left-sidebar-render [own] - (let [flags (rum/react wb/flags-l)] + (let [flags (mx/react wb/flags-l)] (html [:aside#settings-bar.settings-bar.settings-bar-left [:div.settings-bar-inside @@ -50,7 +50,7 @@ (defn right-sidebar-render [own] - (let [flags (rum/react wb/flags-l)] + (let [flags (mx/react wb/flags-l)] (html [:aside#settings-bar.settings-bar [:div.settings-bar-inside diff --git a/src/uxbox/main/ui/workspace/sidebar/drawtools.cljs b/src/uxbox/main/ui/workspace/sidebar/drawtools.cljs index ce75fb476..ea0d5ad0d 100644 --- a/src/uxbox/main/ui/workspace/sidebar/drawtools.cljs +++ b/src/uxbox/main/ui/workspace/sidebar/drawtools.cljs @@ -89,8 +89,8 @@ (defn draw-tools-render [open-toolboxes] - (let [workspace (rum/react wb/workspace-l) - drawing (rum/react drawing-shape) + (let [workspace (mx/react wb/workspace-l) + drawing (mx/react drawing-shape) close #(rs/emit! (dw/toggle-flag :drawtools)) tools (->> (into [] +draw-tools+) (sort-by (comp :priority second)))] diff --git a/src/uxbox/main/ui/workspace/sidebar/history.cljs b/src/uxbox/main/ui/workspace/sidebar/history.cljs index 996d39460..70d953468 100644 --- a/src/uxbox/main/ui/workspace/sidebar/history.cljs +++ b/src/uxbox/main/ui/workspace/sidebar/history.cljs @@ -119,8 +119,8 @@ (defn history-toolbox-render [own] (let [local (:rum/local own) - page (rum/react wb/page-l) - history (rum/react history-l) + page (mx/react wb/page-l) + history (mx/react history-l) section (:section @local :main) close #(rs/emit! (dw/toggle-flag :document-history)) main? (= section :main) @@ -155,7 +155,7 @@ (defn history-dialog-render [own page] - (let [history (rum/react history-l) + (let [history (mx/react history-l) version (:selected history) on-accept #(rs/emit! (udh/apply-selected-history page)) on-cancel #(rs/emit! (udh/deselect-page-history page))] diff --git a/src/uxbox/main/ui/workspace/sidebar/icons.cljs b/src/uxbox/main/ui/workspace/sidebar/icons.cljs index dbdf60bd8..5e75dd7ac 100644 --- a/src/uxbox/main/ui/workspace/sidebar/icons.cljs +++ b/src/uxbox/main/ui/workspace/sidebar/icons.cljs @@ -61,7 +61,7 @@ (defn icons-render [own] (let [local (:rum/local own) - drawing (rum/react drawing-shape) + drawing (mx/react drawing-shape) collid (:collid @local) icons (get-in library/+icon-collections-by-id+ [collid :icons]) on-close #(rs/emit! (dw/toggle-flag :icons)) diff --git a/src/uxbox/main/ui/workspace/sidebar/layers.cljs b/src/uxbox/main/ui/workspace/sidebar/layers.cljs index 6b275693e..ef3d80f6a 100644 --- a/src/uxbox/main/ui/workspace/sidebar/layers.cljs +++ b/src/uxbox/main/ui/workspace/sidebar/layers.cljs @@ -203,7 +203,7 @@ toggle-open (fn [event] (dom/stop-propagation event) (swap! local assoc :open (not open?))) - shapes-by-id (rum/react wb/shapes-by-id-l) + shapes-by-id (mx/react wb/shapes-by-id-l) classes (classnames :selected selected? :drag-top (= :top (:over @local)) @@ -283,10 +283,10 @@ (defn layers-render [own] - (let [workspace (rum/react wb/workspace-l) + (let [workspace (mx/react wb/workspace-l) selected (:selected workspace) - shapes-by-id (rum/react wb/shapes-by-id-l) - page (rum/react (focus-page (:page workspace))) + shapes-by-id (mx/react wb/shapes-by-id-l) + page (mx/react (focus-page (:page workspace))) close #(rs/emit! (udw/toggle-flag :layers)) duplicate #(rs/emit! (uds/duplicate-selected)) group #(rs/emit! (uds/group-selected)) diff --git a/src/uxbox/main/ui/workspace/sidebar/options.cljs b/src/uxbox/main/ui/workspace/sidebar/options.cljs index 3d0945e5d..64c846b7b 100644 --- a/src/uxbox/main/ui/workspace/sidebar/options.cljs +++ b/src/uxbox/main/ui/workspace/sidebar/options.cljs @@ -116,7 +116,7 @@ (defn options-toolbox-render [own] - (let [shape (rum/react selected-shape-l) + (let [shape (mx/react selected-shape-l) close #(rs/emit! (udw/toggle-flag :element-options))] (html [:div.elementa-options.tool-window diff --git a/src/uxbox/main/ui/workspace/sidebar/sitemap.cljs b/src/uxbox/main/ui/workspace/sidebar/sitemap.cljs index aedd11aad..0ab71e3df 100644 --- a/src/uxbox/main/ui/workspace/sidebar/sitemap.cljs +++ b/src/uxbox/main/ui/workspace/sidebar/sitemap.cljs @@ -73,9 +73,9 @@ (defn sitemap-toolbox-render [own] - (let [project (rum/react wb/project-l) - pages (rum/react pages-l) - current (rum/react wb/page-l) + (let [project (mx/react wb/project-l) + pages (mx/react pages-l) + current (mx/react wb/page-l) create #(udl/open! :page-form {:page {:project (:id project)}}) close #(rs/emit! (dw/toggle-flag :sitemap))] (html diff --git a/src/uxbox/view/ui.cljs b/src/uxbox/view/ui.cljs index 78536b157..f7ae62056 100644 --- a/src/uxbox/view/ui.cljs +++ b/src/uxbox/view/ui.cljs @@ -49,7 +49,7 @@ (defn app-render [own] - (let [location (rum/react route-id-ref)] + (let [location (mx/react route-id-ref)] (case location :view/notfound (notfound-page) :view/viewer (viewer-page) diff --git a/src/uxbox/view/ui/viewer.cljs b/src/uxbox/view/ui/viewer.cljs index c971b2d09..635b2a473 100644 --- a/src/uxbox/view/ui/viewer.cljs +++ b/src/uxbox/view/ui/viewer.cljs @@ -52,7 +52,7 @@ :will-unmount viewer-page-will-unmount :will-mount viewer-page-will-mount} [own] - (let [flags (rum/react flags-ref) + (let [flags (mx/react flags-ref) sitemap? (contains? flags :sitemap)] [:section.view-content (when sitemap? diff --git a/src/uxbox/view/ui/viewer/sitemap.cljs b/src/uxbox/view/ui/viewer/sitemap.cljs index e590b2949..5acd50a79 100644 --- a/src/uxbox/view/ui/viewer/sitemap.cljs +++ b/src/uxbox/view/ui/viewer/sitemap.cljs @@ -37,9 +37,9 @@ (defn- sitemap-render [own] - (let [project-name (rum/react project-name-ref) - pages (rum/react pages-ref) - selected (rum/react selected-ref) + (let [project-name (mx/react project-name-ref) + pages (mx/react pages-ref) + selected (mx/react selected-ref) on-click #(rs/emit! (dv/select-page %))] (html [:div.view-sitemap