From 9558673d01ec3b0062d8e76afdc52641c5ee2de2 Mon Sep 17 00:00:00 2001 From: oakes Date: Sat, 6 Sep 2014 11:50:47 -0400 Subject: [PATCH] Deprecate run! infavor of screen! to avoid conflict with clojure 1.7 --- src/play_clj/core.clj | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/play_clj/core.clj b/src/play_clj/core.clj index 49b55a8..6062de7 100644 --- a/src/play_clj/core.clj +++ b/src/play_clj/core.clj @@ -551,14 +551,19 @@ is the atom storing the screen map behind the scenes. Returns the updated [screen & args] ((:update-fn! screen) assoc args)) -(defn run! +(defn screen! "Runs a function defined in another screen. You may optionally pass a series of key-value pairs, which will be given to the function via its screen map. - (run! my-other-screen :on-show) - (run! my-other-screen :on-change-color :color :blue)" + (screen! my-other-screen :on-show) + (screen! my-other-screen :on-change-color :color :blue)" [screen-object fn-name & options] (let [execute-fn! (:execute-fn! screen-object) screen-fn (-> screen-object :options (get fn-name))] (apply execute-fn! screen-fn options) nil)) + +(defn run! + "Deprecated. Please use `screen!` instead." + [& args] + (apply screen! args))