From 668898903f889be5d58c6a89d7f057a80bbe9164 Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Sat, 30 Jul 2016 22:47:55 +0300 Subject: [PATCH] Add missing gotopage interaction. --- .../main/ui/workspace/sidebar/options/interactions.cljs | 2 +- src/uxbox/view/ui/viewer/interactions.cljs | 9 ++++++++- src/uxbox/view/ui/viewer/sitemap.cljs | 1 - 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/uxbox/main/ui/workspace/sidebar/options/interactions.cljs b/src/uxbox/main/ui/workspace/sidebar/options/interactions.cljs index 4ea8c5225..552e4ef94 100644 --- a/src/uxbox/main/ui/workspace/sidebar/options/interactions.cljs +++ b/src/uxbox/main/ui/workspace/sidebar/options/interactions.cljs @@ -188,7 +188,7 @@ :on-change (partial on-change form-ref :page) :value (pr-str (:page @form-ref))} (for [page pages - :let [key (pr-str (:id page))]] + :let [key (:index page)]] [:option {:key key :value key} (:name page)])]]]))) (def pages-input diff --git a/src/uxbox/view/ui/viewer/interactions.cljs b/src/uxbox/view/ui/viewer/interactions.cljs index c6dba0475..2314b4db4 100644 --- a/src/uxbox/view/ui/viewer/interactions.cljs +++ b/src/uxbox/view/ui/viewer/interactions.cljs @@ -7,10 +7,12 @@ (ns uxbox.view.ui.viewer.interactions (:require [promesa.core :as p] [uxbox.util.dom :as dom] + [uxbox.util.rstore :as rs] [uxbox.main.geom :as geom] [uxbox.main.geom.matrix :as gmt] [uxbox.main.geom.point :as gpt] [uxbox.main.state :as st] + [uxbox.view.data.viewer :as dv] [vendor.snapsvg]) (:import goog.events.EventType)) @@ -181,6 +183,10 @@ [{:keys [url]}] (set! (.-href js/location) url)) +(defn- run-gotopage-interaction + [{:keys [page]}] + (rs/emit! (dv/select-page page))) + (defn- run-color-interaction [{:keys [element fill-color stroke-color direction easing delay duration]}] (let [shape (get-in @st/state [:shapes-by-id element]) @@ -223,9 +229,10 @@ :hide (run-hide-interaction itx) :size (run-size-interaction itx) :opacity (run-opacity-interaction itx) - :gotourl (run-gotourl-interaction itx) :color (run-color-interaction itx) :rotate (run-rotate-interaction itx) + :gotourl (run-gotourl-interaction itx) + :gotopage (run-gotopage-interaction itx) (throw (ex-info "undefined interaction" {:action action})))) ;; --- Main Api diff --git a/src/uxbox/view/ui/viewer/sitemap.cljs b/src/uxbox/view/ui/viewer/sitemap.cljs index 89be21589..6c8eceff1 100644 --- a/src/uxbox/view/ui/viewer/sitemap.cljs +++ b/src/uxbox/view/ui/viewer/sitemap.cljs @@ -8,7 +8,6 @@ (ns uxbox.view.ui.viewer.sitemap (:require [sablono.core :refer-macros (html)] [lentes.core :as l] - [rum.core :as rum] [uxbox.util.i18n :refer (tr)] [uxbox.util.mixins :as mx :include-macros true] [uxbox.util.data :refer (parse-int)]