allow parameteriziation of default interceptors

martinklepsch · Dec 27, 2016 · 65209c3 · 65209c3
1 parent 64b9d29
commit 65209c3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/src/re_frame/core.cljc b/src/re_frame/core.cljc
@@ -47,7 +47,8 @@
      {:registry registry
       :event-queue event-queue
       :app-db re-frame.db/app-db
-      :subs-cache subs-cache})))
+      :subs-cache subs-cache
+      :default-interceptors [(cofx/inject-cofx registry :db) (fx/do-fx registry)]})))
 
 (def the-frame (make-frame))
 

diff --git a/src/re_frame/frame.cljc b/src/re_frame/frame.cljc
@@ -47,7 +47,7 @@
     [this id interceptors handler]))
 
 ;; connect all the pieces of state ----
-(defrecord Frame [registry event-queue app-db subs-cache]
+(defrecord Frame [registry event-queue app-db subs-cache default-interceptors]
   IFrame
   ;; dispatch ----
   (dispatch [this event-v]
@@ -95,18 +95,18 @@
     (events/register
      registry
      id
-     [(cofx/inject-cofx registry :db) (fx/do-fx registry) interceptors (stdi/db-handler->interceptor db-handler)]))
+     [default-interceptors interceptors (stdi/db-handler->interceptor db-handler)]))
   (reg-event-fx [this id fx-handler]
     (reg-event-fx this id nil fx-handler))
   (reg-event-fx [this id interceptors fx-handler]
     (events/register
      registry
      id
-     [(cofx/inject-cofx registry :db) (fx/do-fx registry) interceptors (stdi/fx-handler->interceptor fx-handler)]))
+     [default-interceptors interceptors (stdi/fx-handler->interceptor fx-handler)]))
   (reg-event-ctx [this id handler]
     (reg-event-ctx this id nil handler))
   (reg-event-ctx [this id interceptors handler]
     (events/register
      registry
      id
-     [(cofx/inject-cofx registry :db) (fx/do-fx registry) interceptors (stdi/ctx-handler->interceptor handler)])))
+     [default-interceptors interceptors (stdi/ctx-handler->interceptor handler)])))