sync up with changes to how view-sigs are sent in the views library now

This commit is contained in:
Gered 2016-05-19 22:55:36 -04:00
parent 3993415171
commit 082d78d77b
2 changed files with 9 additions and 8 deletions

View file

@ -10,9 +10,9 @@
necessary to hook views and reagent-data-views together via browserchannel." necessary to hook views and reagent-data-views together via browserchannel."
[] []
(views/set-send-fn! (views/set-send-fn!
(fn [client-id [[view-id parameters] view-data]] (fn [client-id [view-sig view-data]]
(log/trace client-id "refresh view" [view-id parameters]) (log/trace client-id "refresh view" view-sig)
(browserchannel/send-data! client-id [:views/refresh [view-id parameters] view-data])))) (browserchannel/send-data! client-id [:views/refresh view-sig view-data]))))
(def middleware (def middleware
"clj-browserchannel server-side event middleware. this should be included in the "clj-browserchannel server-side event middleware. this should be included in the

View file

@ -1,6 +1,5 @@
(ns reagent-data-views.server.core (ns reagent-data-views.server.core
(:require (:require
[clojure.string :as string]
[clojure.tools.logging :as log] [clojure.tools.logging :as log]
[views.core :as views] [views.core :as views]
[reagent-data-views.utils :refer [relevant-event?]])) [reagent-data-views.utils :refer [relevant-event?]]))
@ -13,14 +12,16 @@
(defn handle-subscriptions! (defn handle-subscriptions!
[client-id view-sig] [client-id view-sig]
(log/trace client-id "subscribing to" view-sig) (log/trace client-id "subscribing to" view-sig)
(let [{:keys [namespace view-id parameters]} view-sig] (let [{:keys [view-id parameters]} view-sig]
(views/subscribe! namespace view-id parameters client-id))) ; TODO: namespace
(views/subscribe! nil view-id parameters client-id)))
(defn handle-unsubscriptions! (defn handle-unsubscriptions!
[client-id view-sig] [client-id view-sig]
(log/trace client-id "unsubscribing from" view-sig) (log/trace client-id "unsubscribing from" view-sig)
(let [{:keys [namespace view-id parameters]} view-sig] (let [{:keys [view-id parameters]} view-sig]
(views/unsubscribe! namespace view-id parameters client-id))) ; TODO: namespace
(views/unsubscribe! nil view-id parameters client-id)))
(defn on-receive! (defn on-receive!
[client-id data] [client-id data]