Updated Discovery, fixed issues with navigation

Author: exdis

.eslintignore

@@ -1 +1,2 @@
 build/*.js
+src/discovery

CHANGELOG.md

@@ -1,3 +1,8 @@
+## 1.0.5 (22-11-2018)
+
+* Updated Discovery
+* Fixed issues with navigation
+
 ## 1.0.4 (22-11-2018)
 
 * Initial GitHub release

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "jsondiscovery",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "description": "DiscoveryJson",
   "author": "exsdis@gmail.com",
   "license": "MIT",

package.json

@@ -1,4 +1,4 @@
-import { Widget, router } from '../discovery/lib.umd.js';
+import { Widget, router, complexViews } from '../discovery/lib.umd.js';
 
 require('../discovery/lib.css');
 require('../discovery/common.css');
@@ -13,6 +13,7 @@ function initDiscovery(settings) {
     const discovery = new Widget(document.body);
 
     discovery.apply(router);
+    discovery.apply(complexViews);
 
     discovery.definePage('default', [
         {
@@ -85,6 +86,8 @@ function initDiscovery(settings) {
 }
 
 window.addEventListener('message', function(event) {
+    window.location.hash = event.data.hash;
+
     if (event.data && event.data.json) {
         const { data } = event;
 
@@ -98,11 +101,7 @@ window.addEventListener('message', function(event) {
                 createdAt: new Date().toISOString() // TODO fix in discovery
             }
         );
-
-        discovery.renderPage('default');
     }
-
-    window.location.hash = event.data.hash;
 }, false);
 
 window.addEventListener('hashchange', () => {

src/content/index.js

@@ -58,12 +58,16 @@ if (json) {
         });
     });
 
-    window.addEventListener('message', event => {
-        if (event.data && event.data.hash) {
-            window.location.hash = event.data.hash;
-        } else {
+    const setHash = debounce(hash => {
+        if (hash) {
+            window.location.hash = hash;
+        } else if (window.location.hash) {
             history.pushState('', document.title, window.location.pathname + window.location.search);
         }
+    }, 300);
+
+    const onMessage = event => {
+        setHash(event.data.hash);
 
         if (event.data && event.data.openSettings) {
             if (chrome.runtime.openOptionsPage) {
@@ -72,11 +76,43 @@ if (json) {
                 window.open(chrome.runtime.getURL('pages/settings.html'));
             }
         }
-    });
+    };
 
-    window.addEventListener('hashchange', () => {
+    window.addEventListener('message', onMessage);
+
+    const onHashChange = () => {
         iframe.contentWindow.postMessage({
             hash: window.location.hash
         }, '*');
+    };
+
+    window.addEventListener('hashchange', onHashChange);
+
+    window.addEventListener('beforeunload', () => {
+        window.removeEventListener('message', onMessage);
+        window.removeEventListener('hashchange', onHashChange);
     });
 }
+
+/**
+ * Debounce
+ * @param {Function} func
+ * @param {number} wait
+ * @returns {Function}
+ */
+function debounce(func, wait) {
+    let timer = null;
+
+    return function(...args) {
+        const onComplete = () => {
+            func.apply(this, args);
+            timer = null;
+        };
+
+        if (timer) {
+            clearTimeout(timer);
+        }
+
+        timer = setTimeout(onComplete, wait);
+    };
+}