Update dependencies

dhleong · Nov 12, 2018 · af2c527 · af2c527
1 parent 8ca4430
commit af2c527
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 16 deletions.
diff --git a/project.clj b/project.clj
@@ -1,15 +1,15 @@
 (defproject wish "0.1.0-SNAPSHOT"
   :dependencies [[org.clojure/clojure "1.9.0"]
-                 [org.clojure/clojurescript "1.10.339"]
+                 [org.clojure/clojurescript "1.10.439"]
                  [org.clojure/core.async "0.4.474"]
-                 [org.clojure/tools.reader "1.3.0"]
+                 [org.clojure/tools.reader "1.3.2"]
                  [reagent "0.8.1"]
                  [re-frame "0.10.6"]
                  [secretary "1.2.3"]
                  [re-pressed "0.2.2"]
 
                  [kibu/pushy "0.3.8"]
-                 [cljs-ajax "0.7.4"]
+                 [cljs-ajax "0.7.5"]
                  [com.cemerick/url "0.1.1"]
                  [alandipert/storage-atom "2.0.1"]
                  [com.cognitect/transit-cljs "0.8.256"]
@@ -19,7 +19,7 @@
                  [cljsjs/socket-io-client "2.1.1-0"]
 
                  ; simpler forms
-                 [reagent-forms "0.5.42"]
+                 [reagent-forms "0.5.43"]
 
                  ; sheet-specific inline css
                  [cljs-css-modules "0.2.1"]
@@ -77,17 +77,17 @@
    {:dependencies [[binaryage/devtools "0.9.10"]
                    [day8.re-frame/re-frame-10x "0.3.3-react16"]
                    [day8.re-frame/tracing "0.5.1"]
-                   [figwheel-sidecar "0.5.16"]
+                   [figwheel-sidecar "0.5.17"]
                    ;; [cider/piggieback "0.3.6"]
                    [com.cemerick/piggieback "0.2.2"]
 
-                   [ring "1.7.0"]
+                   [ring "1.7.1"]
                    [ring/ring-defaults "0.3.2"]
                    [compojure "1.6.1"]]
 
     :source-paths ["src/cljs"]
 
-    :plugins      [[lein-figwheel "0.5.16"]
+    :plugins      [[lein-figwheel "0.5.17"]
                    [lein-doo "0.1.10"]
                    [lein-pdo "0.1.1"]]}
 

diff --git a/src/cljs/wish/sheets/dnd5e.cljs b/src/cljs/wish/sheets/dnd5e.cljs
@@ -5,7 +5,6 @@
                    [wish.util.log :as log])
   (:require [clojure.string :as str]
             [reagent.core :as r]
-            [reagent-forms.core :refer [bind-fields]]
             [wish.util :refer [>evt <sub click>evt click>reset!
                                invoke-callable]]
             [wish.util.nav :refer [sheet-url]]

diff --git a/src/cljs/wish/sheets/dnd5e/overlays/custom_item.cljs b/src/cljs/wish/sheets/dnd5e/overlays/custom_item.cljs
@@ -206,13 +206,13 @@
 
 ; ======= reagent-forms events ============================
 
-(defn- event-clear-errors [id value doc]
+(defn- event-clear-errors [id path value doc]
   ; when we provide a value for :name, :default-quantity,
   ; clear any errors that had been raised about them
-  (when (and (some (set id) [:name
+  (when (and (some (set path) [:name
                              :default-quantity])
              (not (str/blank? value)))
-    (update doc :errors dissoc (first id))))
+    (update doc :errors dissoc (first path))))
 
 
 ; ======= creation ========================================

diff --git a/src/cljs/wish/util/nav.cljs b/src/cljs/wish/util/nav.cljs
@@ -32,11 +32,8 @@
     (let [history (pushy/pushy
                     secretary/dispatch!
                     (fn [x]
-                      (let [[uri-path query-string]
-                            (string/split (secretary/uri-without-prefix x) #"\?")
-                            uri-path (secretary/uri-with-leading-slash uri-path)]
-                        (when (secretary/locate-route uri-path)
-                          x))))]
+                      (when (secretary/locate-route x)
+                        x)))]
       (pushy/start! history))
 
     ; #-based navigation