Fixed issues with navigation and raw content copying

Author: exdis

CHANGELOG.md

@@ -1,6 +1,8 @@
 ## 1.0.7 (23-11-2018)
 
 * Updated discovery and jora
+* Fixed issues with raw content copying
+* Another navigation issues fix
 
 ## 1.0.6 (22-11-2018)
 

src/content/index.js

@@ -59,8 +59,11 @@ function initDiscovery(settings) {
         'Copy raw',
         function() {
             const { raw } = discovery.context;
+            const div = document.createElement('div');
+            div.innerHTML = raw;
+            const rawText = div.textContent;
             const el = document.createElement('textarea');
-            el.value = raw;
+            el.value = rawText;
             document.body.appendChild(el);
             el.select();
             document.execCommand('copy');
@@ -82,11 +85,33 @@ function initDiscovery(settings) {
         }
     );
 
+    // TODO fix this
+    let replace = null;
+    const originalSetPageParams = discovery.setPageParams.bind(discovery);
+
+    discovery.setPageParams = (...args) => {
+        originalSetPageParams(...args);
+        replace = args[1];
+    };
+
+    const originalRenderPage = discovery.renderPage.bind(discovery);
+
+    discovery.renderPage = (...args) => {
+        originalRenderPage(...args);
+
+        parent.postMessage({
+            hash: window.location.hash,
+            replace
+        }, '*');
+    };
+
     return discovery;
 }
 
 window.addEventListener('message', function(event) {
-    window.location.hash = event.data.hash;
+    if (window.location.hash !== event.data.hash) {
+        window.location.hash = event.data.hash;
+    }
 
     if (event.data && event.data.json) {
         const { data } = event;
@@ -104,8 +129,8 @@ window.addEventListener('message', function(event) {
     }
 }, false);
 
-window.addEventListener('hashchange', () => {
-    parent.postMessage({
-        hash: window.location.hash
-    }, '*');
-});
+// window.addEventListener('hashchange', () => {
+//     parent.postMessage({
+//         hash: window.location.hash
+//     }, '*');
+// });

src/content/inject.js

@@ -58,16 +58,23 @@ if (json) {
         });
     });
 
-    const setHash = debounce(hash => {
-        if (hash) {
-            window.location.hash = hash;
-        } else if (window.location.hash) {
+    let iframeHash = null;
+
+    const setHash = (hash, replace) => {
+        if (hash && window.location.hash !== hash) {
+            if (replace) {
+                history.replaceState('', document.title, window.location.pathname + window.location.search + hash);
+            } else {
+                window.location.hash = hash;
+            }
+        } else if (!hash && window.location.hash) {
             history.pushState('', document.title, window.location.pathname + window.location.search);
         }
-    }, 300);
+        iframeHash = hash;
+    };
 
     const onMessage = event => {
-        setHash(event.data.hash);
+        setHash(event.data.hash, event.data.replace);
 
         if (event.data && event.data.openSettings) {
             if (chrome.runtime.openOptionsPage) {
@@ -81,9 +88,11 @@ if (json) {
     window.addEventListener('message', onMessage);
 
     const onHashChange = () => {
-        iframe.contentWindow.postMessage({
-            hash: window.location.hash
-        }, '*');
+        if (iframeHash !== null && iframeHash !== window.location.hash) {
+            iframe.contentWindow.postMessage({
+                hash: window.location.hash
+            }, '*');
+        }
     };
 
     window.addEventListener('hashchange', onHashChange);
@@ -93,26 +102,3 @@ if (json) {
         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);
-    };
-}