additional patch on redirect (#288)

camicroscope · Mar 30, 2020 · 87b7012 · 87b7012
1 parent fb3e3b7
commit 87b7012
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 0 deletions.
diff --git a/apps/heatmap/init.js b/apps/heatmap/init.js
@@ -426,6 +426,9 @@ function redirect(url, text = '', sec = 5) {
     window.location.href = url;
   }
   setInterval(function() {
+    if (!timer) {
+      window.location.href = url;
+    }
     if (Loading.instance&&Loading.instance.parentNode) {
       Loading.text.textContent = `${text} ${timer}s.`;
     } else {

diff --git a/apps/labeling/labeling.js b/apps/labeling/labeling.js
@@ -278,6 +278,9 @@ function redirect(url, text = '', sec = 5) {
     window.location.href = url;
   }
   setInterval(function() {
+    if (!timer) {
+      window.location.href = url;
+    }
     if (Loading.instance.parentNode) {
       Loading.text.textContent = `${text} ${timer}s.`;
     } else {

diff --git a/apps/viewer/init.js b/apps/viewer/init.js
@@ -1149,6 +1149,9 @@ function redirect(url, text = '', sec = 5) {
     window.location.href = url;
   }
   setInterval(function() {
+    if (!timer) {
+      window.location.href = url;
+    }
     if (Loading.instance && Loading.instance.parentNode) {
       Loading.text.textContent = `${text} ${timer}s.`;
     } else {

diff --git a/common/util.js b/common/util.js
@@ -526,6 +526,9 @@ function redirect(url, text = '', sec = 5) {
     window.location.href = url;
   }
   setInterval(function() {
+    if (!timer) {
+      window.location.href = url;
+    }
     if (Loading.instance && Loading.instance.parentNode) {
       Loading.text.textContent = `${text} ${timer}s.`;
     } else {

diff --git a/demo/demo.js b/demo/demo.js
@@ -206,6 +206,9 @@ function redirect(url, text = '', sec = 5) {
     window.location.href = url;
   }
   setInterval(function() {
+    if (!timer) {
+      window.location.href = url;
+    }
     if (Loading.instance.parentNode) {
       Loading.text.textContent = `${text} ${timer}s.`;
     } else {