From 082d78d77bb18d21d4cdcee82d317da75cafa6a3 Mon Sep 17 00:00:00 2001 From: gered Date: Thu, 19 May 2016 22:55:36 -0400 Subject: [PATCH] sync up with changes to how view-sigs are sent in the views library now --- .../src/reagent_data_views/browserchannel/server.clj | 6 +++--- .../src/reagent_data_views/server/core.clj | 11 ++++++----- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/reagent-data-views-browserchannel/src/reagent_data_views/browserchannel/server.clj b/reagent-data-views-browserchannel/src/reagent_data_views/browserchannel/server.clj index 1c6ece4..4d1044e 100644 --- a/reagent-data-views-browserchannel/src/reagent_data_views/browserchannel/server.clj +++ b/reagent-data-views-browserchannel/src/reagent_data_views/browserchannel/server.clj @@ -10,9 +10,9 @@ necessary to hook views and reagent-data-views together via browserchannel." [] (views/set-send-fn! - (fn [client-id [[view-id parameters] view-data]] - (log/trace client-id "refresh view" [view-id parameters]) - (browserchannel/send-data! client-id [:views/refresh [view-id parameters] view-data])))) + (fn [client-id [view-sig view-data]] + (log/trace client-id "refresh view" view-sig) + (browserchannel/send-data! client-id [:views/refresh view-sig view-data])))) (def middleware "clj-browserchannel server-side event middleware. this should be included in the diff --git a/reagent-data-views/src/reagent_data_views/server/core.clj b/reagent-data-views/src/reagent_data_views/server/core.clj index 827947f..839f6d7 100644 --- a/reagent-data-views/src/reagent_data_views/server/core.clj +++ b/reagent-data-views/src/reagent_data_views/server/core.clj @@ -1,6 +1,5 @@ (ns reagent-data-views.server.core (:require - [clojure.string :as string] [clojure.tools.logging :as log] [views.core :as views] [reagent-data-views.utils :refer [relevant-event?]])) @@ -13,14 +12,16 @@ (defn handle-subscriptions! [client-id view-sig] (log/trace client-id "subscribing to" view-sig) - (let [{:keys [namespace view-id parameters]} view-sig] - (views/subscribe! namespace view-id parameters client-id))) + (let [{:keys [view-id parameters]} view-sig] + ; TODO: namespace + (views/subscribe! nil view-id parameters client-id))) (defn handle-unsubscriptions! [client-id view-sig] (log/trace client-id "unsubscribing from" view-sig) - (let [{:keys [namespace view-id parameters]} view-sig] - (views/unsubscribe! namespace view-id parameters client-id))) + (let [{:keys [view-id parameters]} view-sig] + ; TODO: namespace + (views/unsubscribe! nil view-id parameters client-id))) (defn on-receive! [client-id data]