From 5339b4054f1dc2c9ab7bcdebe2656d2d9d614be7 Mon Sep 17 00:00:00 2001
From: s-ol <s-ol@users.noreply.github.com>
Date: Fri, 23 Nov 2018 23:35:15 +1100
Subject: fix page transition for browser navigates

---
 mmm/mmmfs/browser.moon | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/mmm/mmmfs/browser.moon b/mmm/mmmfs/browser.moon
index 97efc4e..dd1ab9e 100644
--- a/mmm/mmmfs/browser.moon
+++ b/mmm/mmmfs/browser.moon
@@ -34,6 +34,7 @@ class Browser
     -- update URL bar
     if MODE == 'CLIENT'
       @path\subscribe (path) ->
+        document.body.classList\add 'loading'
         return if @skip
         vis_path = path .. (if '/' == path\sub -1 then '' else '/')
         window.history\pushState path, '', vis_path
@@ -110,7 +111,11 @@ class Browser
 
     -- append or patch #browser-content
     main\append with get_or_create 'div', 'browser-content', class: 'content'
-      \append (@facet\map (p) -> @get_content p), (rehydrate and .node.lastChild)
+      content = ReactiveVar @get_content @facet\get!
+      if MODE == 'CLIENT'
+        @facet\subscribe (p) ->
+          window\setTimeout (-> content\set @get_content p), 150
+      \append content, (rehydrate and .node.lastChild)
 
     if rehydrate
       -- force one rerender to set onclick handlers etc
@@ -190,11 +195,7 @@ class Browser
   default_convert = (key) => @get key.name, 'mmm/dom'
 
   navigate: (new) =>
-    if MODE == 'CLIENT'
-      document.body.classList\add 'loading'
-      window\setTimeout (-> @path\set new), 150
-    else
-      @path\set new
+    @path\set new
 
 {
   :Browser
-- 
cgit v1.2.3