Updated deps, improved error handling

See use of (.stopPropagation e) and (.preventDefault e) in
http://kapilreddy.me/cljs/core.async/2013/08/12/core_async_webgl_korova_drop.html

Author: tmarble

README.md

@@ -57,6 +57,6 @@ Here are three (mostly) working servers:
 
 ## Copyright and license
 
-Copyright © 2014 Tom Marble
+Copyright © 2014-2015 Tom Marble
 
 Licensed under the EPL (see the file [EPL](https://raw.githubusercontent.com/tmarble/escurel/master/EPL)).

project.clj

@@ -7,15 +7,15 @@
             :comments "same as Clojure"}
 
   :dependencies [[org.clojure/clojure "1.6.0"]
-                 [org.clojure/clojurescript "0.0-2665"]
+                 [org.clojure/clojurescript "0.0-2850"]
                  [org.clojure/core.async "0.1.346.0-17112a-alpha"]
-                 [om "0.8.0-rc1"]
+                 [org.omcljs/om "0.8.8"]
                  [javax.servlet/servlet-api "2.5"]
                  [http-kit "2.1.19"]
                  [compojure "1.3.1"]
                  ;; for chord
-                 [com.fasterxml.jackson.core/jackson-core "2.3.2"]
-                 [jarohen/chord "0.5.0" :exclusions [org.clojure/clojure commons-codec com.fasterxml.jackson.core/jackson-core]]]
+                 [com.fasterxml.jackson.core/jackson-core "2.5.1"]
+                 [jarohen/chord "0.6.0" :exclusions [org.clojure/clojure commons-codec com.fasterxml.jackson.core/jackson-core]]]
 
   :plugins [[lein-cljsbuild "1.0.4"]]
 
@@ -24,13 +24,23 @@
   :jvm-opts ["-server" "-Xmx256m"] ;; optional
 
   :cljsbuild {
-    :builds [{:id "escurel"
+    :builds [{:id "dev"
               :source-paths ["src/cljs"]
               :compiler {
+                         ;; :main main.core
                          :output-dir "resources/public/js/"
                          :output-to "resources/public/js/escurel.js"
                          :optimizations :none
-                         :source-map true}}]}
+                         :source-map true}}
+             ;; {:id "release"
+             ;;  :source-paths ["src/cljs"]
+             ;;  :compiler {
+             ;;             ;; :main main.core
+             ;;             :output-dir "resources/public/js/"
+             ;;             :output-to "resources/public/js/escurel.js"
+             ;;             :optimizations :advanced
+             ;;             :pretty-print false}}
+             ]}
 
   :main escurel.server
   )

src/clj/escurel/server.clj

@@ -71,8 +71,7 @@
               (>! ws-channel
                   (if error
                     (format "Error: '%s'." (pr-str msg))
-                    (format "You passed: %s at %s with %s."
-                            (pr-str message)
+                    (format "Client at %s said %s."
                             (java.util.Date.)
                             (str msg)))))
             (recur)))))))

src/cljs/escurel/client.cljs

@@ -62,9 +62,16 @@
     om/IInitState
     (init-state [_]
       (let [ch (chan 1)
-            request (fn [value]
+            request (fn [e value]
                       (println "login-request" value)
-                      (put! ch value))
+                      (put! ch value)
+                      ;; "Warning: Returning `false` from an event
+                      ;; handler is deprecated and will be ignored in
+                      ;; a future release. Instead, manually call
+                      ;; e.stopPropagation() or e.preventDefault(), as
+                      ;; appropriate."
+                      (.preventDefault e)
+                      (.stopPropagation e))
             action (fn [value]
                      (login-action login value))
             thread {:component :login
@@ -79,20 +86,20 @@
           (dom/span #js {:style (display (= status :loggedout))}
             "Please log in ")
           (dom/button #js {:style (display (= status :loggedout))
-                           :onClick #(request :sqrl)}
+                           :onClick #(request % :sqrl)}
             "Log in")
           (dom/span #js {:style (display (= status :sqrl))}
             "Please use SQRL to login now...")
           (dom/button #js {:style (display (= status :sqrl))
-                           :onClick #(request "fred")}
+                           :onClick #(request % "fred")}
             "SQRL")
           (dom/button #js {:style (display (= status :sqrl))
-                           :onClick #(request :loggedout)}
+                           :onClick #(request % :loggedout)}
             "Cancel")
           (dom/span #js {:style (display (= status :loggedin))}
             "Click to log out ")
           (dom/button #js {:style (display (= status :loggedin))
-                           :onClick #(request :loggedout)}
+                           :onClick #(request % :loggedout)}
             "Log out")
           )))))
 
@@ -119,13 +126,17 @@
           "toc")))))
 
 (defn edit-change [e data edit-key owner]
-  (om/transact! data edit-key (fn [_] (.. e -target -value))))
+  (om/transact! data edit-key (fn [_] (.. e -target -value)))
+  (.preventDefault e)
+  (.stopPropagation e))
 
 ;; cb is the on-edit callback (a closure bound to the :class/id)
-(defn edit-end [text owner cb]
+(defn edit-end [e text owner cb]
   ;; (println "edit-end")
   (om/set-state! owner :editing false)
-  (cb text))
+  (cb text)
+  (.preventDefault e)
+  (.stopPropagation e))
 
 ;; in the Intermediate tutorial this function is used to
 ;; persist changes.. here just print the update on the console
@@ -165,9 +176,9 @@
                  :value text
                  :onChange #(edit-change % data edit-key owner)
                  :onKeyDown #(when (= (.-key %) "Enter")
-                               (edit-end text owner edit-cb))
+                               (edit-end % text owner edit-cb))
                  :onBlur #(when (om/get-state owner :editing)
-                            (edit-end text owner edit-cb))})
+                            (edit-end % text owner edit-cb))})
           (hspacer)
           (dom/button
             #js {:style (display (not editing))
@@ -222,7 +233,6 @@
                           {:opts {:edit-label :label
                                   :edit-key :msg
                                   :edit-button "Compose"}}))
-            (dom/li nil "use transit")
             ))
         ))))