Merge pull request #130 from metosin/frontend-routing-4

Frontend routing 4

modules/reitit-frontend/src/reitit/frontend/easy.cljs

@@ -15,15 +15,15 @@
   remove listeners using stop! call before calling start! again.
 
   Parameters:
-  - router         The Reitit routing tree.
-  - on-navigate    Function to be called when route changes. Takes two parameters, ´token´ and ´history´ object.
+  - router         The Reitit router.
+  - on-navigate    Function to be called when route changes. Takes two parameters, ´match´ and ´history´ object.
 
   Options:
   - :use-fragment  (default true) If true, onhashchange and location hash are used to store the token."
-  [routes on-navigate opts]
+  [router on-navigate opts]
   (swap! history (fn [old-history]
                    (rfh/stop! old-history)
-                   (rfh/start! routes on-navigate opts))))
+                   (rfh/start! router on-navigate opts))))
 
 (defn href
   ([k]

modules/reitit-frontend/src/reitit/frontend/history.cljs

@@ -16,7 +16,7 @@
 
 ;; This version listens for both pop-state and hash-change for
 ;; compatibility for old browsers not supporting History API.
-(defrecord FragmentHistory [on-navigate router listen-key last-fragment]
+(defrecord FragmentHistory [on-navigate router popstate-listener hashchange-listener last-fragment]
   History
   (-init [this]
     ;; Link clicks and e.g. back button trigger both events, if fragment is same as previous ignore second event.
@@ -30,12 +30,11 @@
                         (-on-navigate this path))))]
       (-on-navigate this (-get-path this))
       (assoc this
-             :listen-key (gevents/listen js/window
-                                         #js [goog.events.EventType.POPSTATE goog.events.EventType.HASHCHANGE]
-                                         handler
-                                         false))))
+             :popstate-listener (gevents/listen js/window goog.events.EventType.POPSTATE handler false)
+             :hashchange-listener (gevents/listen js/window goog.events.EventType.HASHCHANGE handler false))))
   (-stop [this]
-    (gevents/unlistenByKey listen-key))
+    (gevents/unlistenByKey popstate-listener)
+    (gevents/unlistenByKey hashchange-listener))
   (-on-navigate [this path]
     (reset! last-fragment path)
     (on-navigate (rf/match-by-path router path) this))
@@ -102,11 +101,14 @@
 
 (defn start!
   "This registers event listeners on HTML5 history and hashchange events.
+
+  Returns History object.
+
   When using with development workflow like Figwheel, rememeber to
   remove listeners using stop! call before calling start! again.
 
   Parameters:
-  - router         The Reitit routing tree.
+  - router         The Reitit router.
   - on-navigate    Function to be called when route changes. Takes two parameters, ´match´ and ´history´ object.
 
   Options: