Fixes close button on portfolio and picture templates

davidmerfield · Apr 23, 2021 · e0a0817 · e0a0817
1 parent b974133
commit e0a0817
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 12 deletions.
diff --git a/app/templates/latest/picture/script.js b/app/templates/latest/picture/script.js
@@ -26,17 +26,13 @@ function lastIndexPage () {
 
   visitedPosts.slice().reverse().forEach(function(item, i) {
 
-    // console.log(backIndex, item.pathname, articles.indexOf(item.pathname));
-
-    if (backIndex === null && articles.indexOf(item.pathname) === -1) {
+    if (backIndex === null && articles.indexOf(decodeURIComponent(item.pathname)) === -1) {
       backIndex = i;
       return false;
     }
   });
 
-  // console.log('BACK INDEX', backIndex);
-
-  if (backIndex !== null) 
+  if (backIndex !== null && backIndex !== 0) 
     window.history.go(-backIndex);
   else 
     window.location = '/';

diff --git a/app/templates/past/portfolio/script.js b/app/templates/past/portfolio/script.js
@@ -18,17 +18,13 @@ function lastIndexPage () {
 
   visitedPosts.slice().reverse().forEach(function(item, i) {
 
-    // console.log(backIndex, item.pathname, articles.indexOf(item.pathname));
-
-    if (backIndex === null && articles.indexOf(item.pathname) === -1) {
+    if (backIndex === null && articles.indexOf(decodeURIComponent(item.pathname)) === -1) {
       backIndex = i;
       return false;
     }
   });
 
-  // console.log('BACK INDEX', backIndex);
-
-  if (backIndex !== null) 
+  if (backIndex !== null && backIndex !== 0) 
     window.history.go(-backIndex);
   else 
     window.location = '/';