Added jsonp support.

Raynes · Nov 1, 2011 · 8a3abf7 · 8a3abf7
1 parent ef3b421
commit 8a3abf7
Showing 1 changed file with 11 additions and 8 deletions.
diff --git a/src/tryclojure/core.clj b/src/tryclojure/core.clj
@@ -139,14 +139,17 @@
     (catch Exception e
       {:error true :message (str (root-cause e))})))
 
-(defpage "/eval.json" {:keys [expr]}
+(defpage "/eval.json" {:keys [expr jsonp]}
-  (json
+  (update-in
-   (let [{:keys [expr result error message] :as res} (eval-request expr)]
+   (json
-     (if error
+    (let [{:keys [expr result error message] :as res} (eval-request expr)]
-       res
+      (if error
-       (let [[out res] result]
+        res
-         {:expr (pr-str expr)
+        (let [[out res] result]
-          :result (str out (pr-str res))})))))
+          {:expr (pr-str expr)
+           :result (str out (pr-str res))}))))
+   [:body]
+   #(if jsonp (str jsonp "(" % ")") %)))
 
 (server/add-middleware wrap-file (System/getProperty "user.dir"))