From c938b172a49433291e246b04f9835f3383bad0c8 Mon Sep 17 00:00:00 2001
From: bbonvi <6573230@gmail.com>
Date: Fri, 31 Mar 2023 19:29:34 +0600
Subject: fix missing live preview and progress during certain tasks

Sometimes tasks take longer than 5 seconds to start,
resulting in missing progress bar and livepreviews,
so we have to keep pulling for progress a bit longer (5s -> 20s).
---
 javascript/progressbar.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'javascript/progressbar.js')

diff --git a/javascript/progressbar.js b/javascript/progressbar.js
index 4ac9b8db..eb44aab9 100644
--- a/javascript/progressbar.js
+++ b/javascript/progressbar.js
@@ -138,7 +138,7 @@ function requestProgress(id_task, progressbarContainer, gallery, atEnd, onProgre
                 return
             }
 
-            if(elapsedFromStart > 5 && !res.queued && !res.active){
+            if(elapsedFromStart > 20 && !res.queued && !res.active){
                 removeProgressBar()
                 return
             }
-- 
cgit v1.2.1


From 8ae8aeca75debdf83d18416d16869b04fb320451 Mon Sep 17 00:00:00 2001
From: bbonvi <6573230@gmail.com>
Date: Mon, 24 Apr 2023 13:12:49 +0600
Subject: pull progress for 40 seconds

for some extreme network conditions 20 seconds may not be enough
---
 javascript/progressbar.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'javascript/progressbar.js')

diff --git a/javascript/progressbar.js b/javascript/progressbar.js
index eb44aab9..8df3f569 100644
--- a/javascript/progressbar.js
+++ b/javascript/progressbar.js
@@ -138,7 +138,7 @@ function requestProgress(id_task, progressbarContainer, gallery, atEnd, onProgre
                 return
             }
 
-            if(elapsedFromStart > 20 && !res.queued && !res.active){
+            if(elapsedFromStart > 40 && !res.queued && !res.active){
                 removeProgressBar()
                 return
             }
-- 
cgit v1.2.1


From c48ab36cb9e0120c6f1779bee9e875bee8f903f5 Mon Sep 17 00:00:00 2001
From: AUTOMATIC <16777216c@gmail.com>
Date: Sat, 29 Apr 2023 22:16:54 +0300
Subject: alternate restore progress button implementation

---
 javascript/progressbar.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'javascript/progressbar.js')

diff --git a/javascript/progressbar.js b/javascript/progressbar.js
index 8df3f569..23bbf298 100644
--- a/javascript/progressbar.js
+++ b/javascript/progressbar.js
@@ -66,7 +66,7 @@ function randomId(){
 // starts sending progress requests to "/internal/progress" uri, creating progressbar above progressbarContainer element and
 // preview inside gallery element. Cleans up all created stuff when the task is over and calls atEnd.
 // calls onProgress every time there is a progress update
-function requestProgress(id_task, progressbarContainer, gallery, atEnd, onProgress){
+function requestProgress(id_task, progressbarContainer, gallery, atEnd, onProgress, inactivityTimeout=40){
     var dateStart = new Date()
     var wasEverActive = false
     var parentProgressbar = progressbarContainer.parentNode
@@ -138,7 +138,7 @@ function requestProgress(id_task, progressbarContainer, gallery, atEnd, onProgre
                 return
             }
 
-            if(elapsedFromStart > 40 && !res.queued && !res.active){
+            if(elapsedFromStart > inactivityTimeout && !res.queued && !res.active){
                 removeProgressBar()
                 return
             }
-- 
cgit v1.2.1


From 8ccc27127bd5abcba05f30f8a72fc37025b588ac Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Sun, 30 Apr 2023 22:08:52 +0300
Subject: Fix a whole bunch of implicit globals

---
 javascript/progressbar.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'javascript/progressbar.js')

diff --git a/javascript/progressbar.js b/javascript/progressbar.js
index 23bbf298..7b853a40 100644
--- a/javascript/progressbar.js
+++ b/javascript/progressbar.js
@@ -10,7 +10,6 @@ function getGallerySelectedIndex(id_gallery){
 
 function request(url, data, handler, errorHandler){
     var xhr = new XMLHttpRequest();
-    var url = url;
     xhr.open("POST", url, true);
     xhr.setRequestHeader("Content-Type", "application/json");
     xhr.onreadystatechange = function () {
@@ -107,7 +106,7 @@ function requestProgress(id_task, progressbarContainer, gallery, atEnd, onProgre
                 divProgress.style.width = rect.width + "px";
             }
 
-            progressText = ""
+            let progressText = ""
 
             divInner.style.width = ((res.progress || 0) * 100.0) + '%'
             divInner.style.background = res.progress ? "" : "transparent"
-- 
cgit v1.2.1


From f6a40a2ffacaba63915f11c47e77e84a06ed073c Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Sun, 30 Apr 2023 22:12:24 +0300
Subject: Fix unused variables

---
 javascript/progressbar.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'javascript/progressbar.js')

diff --git a/javascript/progressbar.js b/javascript/progressbar.js
index 7b853a40..8d2c3492 100644
--- a/javascript/progressbar.js
+++ b/javascript/progressbar.js
@@ -1,10 +1,10 @@
 // code related to showing and updating progressbar shown as the image is being made
 
-function rememberGallerySelection(id_gallery){
+function rememberGallerySelection(){
 
 }
 
-function getGallerySelectedIndex(id_gallery){
+function getGallerySelectedIndex(){
 
 }
 
-- 
cgit v1.2.1