Fix overlay+back handling on prod

dhleong · Nov 17, 2018 · 2ec4f9f · 2ec4f9f
1 parent 0ea71c7
commit 2ec4f9f
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 26 deletions.
diff --git a/src/cljs/wish/events.cljs b/src/cljs/wish/events.cljs
@@ -61,8 +61,8 @@
 
            ; always dismiss
            (assoc db :showing-overlay nil))
-     :make-overlay-closable! (and overlay-spec
-                                  (nil? (:showing-overlay db)))}))
+     :make-overlay-closeable! (and overlay-spec
+                                   (nil? (:showing-overlay db)))}))
 
 (reg-event-fx
   :title!

diff --git a/src/cljs/wish/fx.cljs b/src/cljs/wish/fx.cljs
@@ -11,7 +11,8 @@
             [wish.push :as push]
             [wish.providers :as providers :refer [load-sheet! save-sheet!]]
             [wish.sheets :as sheets]
-            [wish.util :refer [>evt]]))
+            [wish.util :refer [>evt]]
+            [wish.util.nav :as nav]))
 
 ; ======= html stuff =======================================
 
@@ -38,30 +39,9 @@
 
 ; ======= support back button to close overlays ===========
 
-(def ^:private overlay-suffix "?overlay")
-
-(defn- dismiss-from-event []
-  (set! js/window.onpopstate nil)
-  (>evt [:toggle-overlay nil]))
-
 (reg-fx
-  :make-overlay-closable!
-  (fn [closable?]
-    (cond
-      closable?
-      (do
-        ; such hacks: navigate to the same url but with a trivial suffix
-        ; appended (so it doesn't register as a different page) then
-        ; hook onpopstate
-        (set! js/window.location (str js/window.location overlay-suffix))
-        (set! js/window.onpopstate dismiss-from-event))
-
-      ; closing manually; if we have the ?overlay url, go back to remove it
-      (str/ends-with? (str js/window.location) overlay-suffix)
-      (do
-        ; stop listening to onpopstate
-        (set! js/window.onpopstate nil)
-        (js/history.go -1)))))
+  :make-overlay-closeable!
+  nav/make-overlay-closeable!)
 
 
 ; ======= provider-related =================================

diff --git a/src/cljs/wish/util/nav.cljs b/src/cljs/wish/util/nav.cljs
@@ -99,3 +99,34 @@
                           (name %)
                           (str %))
                        extra-sections)))))
+
+
+; ======= support back button to close overlays ===========
+
+(def ^:private overlay-suffix
+  (if pushy-supported?
+    "#overlay"
+    "?overlay"))
+
+(defn- dismiss-from-event []
+  (set! js/window.onpopstate nil)
+  (>evt [:toggle-overlay nil]))
+
+(defn make-overlay-closeable!
+  [closable?]
+  (cond
+    closable?
+    (do
+      ; such hacks: navigate to the same url but with a trivial suffix
+      ; appended (so it doesn't register as a different page) then
+      ; hook onpopstate
+      (set! js/window.location (str js/window.location overlay-suffix))
+      (set! js/window.onpopstate dismiss-from-event))
+
+    ; closing manually; if we have the ?overlay url, go back to remove it
+    (str/ends-with? (str js/window.location) overlay-suffix)
+    (do
+      ; stop listening to onpopstate
+      (set! js/window.onpopstate nil)
+      (js/history.go -1))))
+