From 8b23cd6f3c6a49f9fd2a297eb32d5a18c6d86659 Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Wed, 13 Apr 2016 23:53:49 +0300 Subject: [PATCH] Improve form related events naming. --- src/uxbox/data/workspace.cljs | 10 +++++----- src/uxbox/ui/workspace/settings.cljs | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/uxbox/data/workspace.cljs b/src/uxbox/data/workspace.cljs index 5a721f0b4a..8f08b9ca69 100644 --- a/src/uxbox/data/workspace.cljs +++ b/src/uxbox/data/workspace.cljs @@ -200,7 +200,7 @@ ;; --- Update Workspace Settings (Form) -(defrecord UpdateWorkspaceSettings [id options] +(defrecord SubmitWorkspaceSettings [id options] rs/WatchEvent (-apply-watch [_ state s] (rx/of (udp/update-page-options id options) @@ -211,16 +211,16 @@ (-apply-effect [_ state] (lightbox/close!))) -(def update-workspace-settings-schema +(def submit-workspace-settings-schema {:grid/y-axis [sc/required sc/integer [sc/in-range 2 100]] :grid/x-axis [sc/required sc/integer [sc/in-range 2 100]] :grid/alignment [sc/boolean] :grid/color [sc/required sc/color]}) -(defn update-workspace-settings +(defn submit-workspace-settings [id data] - (let [schema update-workspace-settings-schema + (let [schema submit-workspace-settings-schema [errors data] (sc/validate data schema)] (if errors (udf/assign-errors :workspace/settings errors) - (UpdateWorkspaceSettings. id data)))) + (SubmitWorkspaceSettings. id data)))) diff --git a/src/uxbox/ui/workspace/settings.cljs b/src/uxbox/ui/workspace/settings.cljs index f3f4cb3146..598c75e6df 100644 --- a/src/uxbox/ui/workspace/settings.cljs +++ b/src/uxbox/ui/workspace/settings.cljs @@ -57,7 +57,7 @@ (rs/emit! (assign-field-value :grid/alignment checked?)))) (on-submit [event] (dom/prevent-default event) - (rs/emit! (udw/update-workspace-settings (:id page) form)))] + (rs/emit! (udw/submit-workspace-settings (:id page) form)))] (html [:form {:on-submit on-submit} [:span.lightbox-label "Grid size"]