Fix 404 handling in navaid.

plentico · May 1, 2020 · 73f0b0c · 73f0b0c
1 parent ec7bff8
commit 73f0b0c
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 44 deletions.
diff --git a/defaults/layout/ejected/router.svelte b/defaults/layout/ejected/router.svelte
@@ -19,40 +19,28 @@
   allNodes = nodes;
 
   function draw(m) {
-    node = getNode(uri);
-    route = m.default;
-    window.scrollTo(0, 0);
-  }
-
-  function track(obj) {
-    uri = obj.state || obj.uri;
-    /*
-    if (window.ga) ga.send('pageview', { dp:uri });
-
     node = getNode(uri);
     if (node === undefined) {
       node = {
         "path": "/404",
         "type": "404",
-        "filename": "404.json"
+        "filename": "404.json",
+        "fields": {}
       }
-      handle404(node);
     }
-    allNodes = nodes;
-    */
+    route = m.default;
+    window.scrollTo(0, 0);
+  }
+
+  function track(obj) {
+    uri = obj.state || obj.uri;
   }
 
   addEventListener('replacestate', track);
   addEventListener('pushstate', track);
   addEventListener('popstate', track);
 
-  const handle404 = node => {
-    if (node.filename == "404.json") {             
-      import('../content/404.js').then(draw);
-    }
-  }
-
-  const router = Navaid('/', handle404(node));
+  const router = Navaid('/', () => import('../content/404.js').then(draw));
 
   allNodes.forEach(node => {
     router.on(node.path, () => {
@@ -63,8 +51,10 @@
       } else {
         import('../content/' + node.type + '.js').then(draw);
       }
-    }).listen();
+    });
 
   });
 
+  router.listen();
+
 </script>
diff --git a/generated/defaults.go b/generated/defaults.go
@@ -315,40 +315,28 @@ export default app;
   allNodes = nodes;
 
   function draw(m) {
-    node = getNode(uri);
-    route = m.default;
-    window.scrollTo(0, 0);
-  }
-
-  function track(obj) {
-    uri = obj.state || obj.uri;
-    /*
-    if (window.ga) ga.send('pageview', { dp:uri });
-
     node = getNode(uri);
     if (node === undefined) {
       node = {
         "path": "/404",
         "type": "404",
-        "filename": "404.json"
+        "filename": "404.json",
+        "fields": {}
       }
-      handle404(node);
     }
-    allNodes = nodes;
-    */
+    route = m.default;
+    window.scrollTo(0, 0);
+  }
+
+  function track(obj) {
+    uri = obj.state || obj.uri;
   }
 
   addEventListener('replacestate', track);
   addEventListener('pushstate', track);
   addEventListener('popstate', track);
 
-  const handle404 = node => {
-    if (node.filename == "404.json") {             
-      import('../content/404.js').then(draw);
-    }
-  }
-
-  const router = Navaid('/', handle404(node));
+  const router = Navaid('/', () => import('../content/404.js').then(draw));
 
   allNodes.forEach(node => {
     router.on(node.path, () => {
@@ -359,10 +347,12 @@ export default app;
       } else {
         import('../content/' + node.type + '.js').then(draw);
       }
-    }).listen();
+    });
 
   });
 
+  router.listen();
+
 </script>
 `),
 	"/layout/global/footer.svelte": []byte(`<script>