From 1d2ffb0d4f85870516f98fdfcbab750aa4a9bdde Mon Sep 17 00:00:00 2001 From: mike-thompson-day8 Date: Fri, 27 Feb 2015 02:07:35 +1100 Subject: [PATCH] Rename apply-event to trim-v, allow handler to get vector of middleware --- src/re_frame/core.cljs | 4 ++-- src/re_frame/handlers.cljs | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/re_frame/core.cljs b/src/re_frame/core.cljs index 156c8ad..1048529 100644 --- a/src/re_frame/core.cljs +++ b/src/re_frame/core.cljs @@ -21,7 +21,7 @@ (def path middleware/path) (def validate middleware/validate) (def log-events middleware/log-events) -(def apply-event middleware/apply-event) +(def trim-v middleware/trim-v) @@ -32,4 +32,4 @@ ([id handler] (register-handler id pure handler)) ([id middleware handler] - (register-handler id (comp pure middleware) handler))) + (register-handler id [pure middleware] handler))) diff --git a/src/re_frame/handlers.cljs b/src/re_frame/handlers.cljs index 2877ea9..f9b662c 100644 --- a/src/re_frame/handlers.cljs +++ b/src/re_frame/handlers.cljs @@ -19,7 +19,11 @@ (swap! id->fn assoc event-id handler-fn)) ([event-id middleware handler-fn] - (register event-id (middleware handler-fn)))) + (let [mware (if (vector? middleware) + (apply comp middleware) ;; compose the vector of middleware + middleware) + hander-fn (mware handler-fn)] + (register event-id hander-fn)))) ;; -- The Event Conveyor Belt --------------------------------------------------------------------