From 65e56bf8f6cb2d158fc21c03094e2c8435abfbf0 Mon Sep 17 00:00:00 2001
From: Hieromon Ikasamo <Hieromon@users.noreply.github.com>
Date: Fri, 17 May 2019 01:30:26 +0900
Subject: [PATCH] Improved update duration page

---
 src/AutoConnectUpdatePage.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/AutoConnectUpdatePage.h b/src/AutoConnectUpdatePage.h
index c401786..64192b0 100644
--- a/src/AutoConnectUpdatePage.h
+++ b/src/AutoConnectUpdatePage.h
@@ -32,12 +32,12 @@ const AutoConnectUpdate::ACElementProp_t AutoConnectUpdate::_elmProgress[] PROGM
   { AC_Element, "url", "</dv>", nullptr },
   { AC_Element, "c3", "<div id=\"progress\">Updating...<span style=\"display:inline-block;vertical-align:middle;margin-left:7px\">", nullptr },
   { AC_Element, "progress_meter", "<meter min=\"0\" />", nullptr },
-  { AC_Element, "progress_loader", "<div class=\"loader\" />", nullptr },
+  { AC_Element, "progress_loader", "<div id=\"ld\" />", nullptr },
   { AC_Element, "c4", "</span></div></div>", nullptr },
   { AC_Text, "status", nullptr, nullptr },
-  { AC_Element, "c5", "<script type=\"text/javascript\">var ws;window.onload=function(){(ws=new WebSocket(\"", nullptr },
+  { AC_Element, "c5", "<script type=\"text/javascript\">var ws;function rd(){location.href=\"" AUTOCONNECT_URI_UPDATE_RESULT "\"}window.onload=function(){(ws=new WebSocket(\"", nullptr },
   { AC_Element, "wsurl", nullptr, nullptr },
-  { AC_Element, "c6", "\")).onopen=function(){ws.onmessage=function(e){var o=e.data.split(\",\");\"#e\"==o[0]?ws.close(1e3):\"#p\"==o[0]&&incr(o[1])}},ws.onclose=function(e){console.log(\"WS close(\"+e.code+\") \"+e.reason),1e3!=e.code&&(document.getElementById(\"status\").textContent=\"WebSocket connection closed. (\"+e.code+\")\"),location.href=\"" AUTOCONNECT_URI_UPDATE_RESULT "\"},ws.onerror=function(e){1==ws.readyState&&(document.getElementById(\"status\").textContent=\"WebSocket \"+e.type)}},window.onbeforeunload=function(){ws.close()};", nullptr },
+  { AC_Element, "c6", "\")).onopen=function(){ws.onmessage=function(e){var o=e.data.split(\",\");if(\"#s\"==o[0]){window.setTimeout(rd,18e4);var n=document.getElementById(\"ld\");n&&(n.className=\"loader\")}else\"#e\"==o[0]?ws.close():\"#p\"==o[0]&&incr(o[1])}},ws.onerror=function(e){console.log(\"WS err(\"+e.code+\") \"+e.reason),1==ws.readyState&&(document.getElementById(\"status\").textContent=\"WebSocket \"+e.type)},ws.onclose=function(e){rd()}};", nullptr },
   { AC_Element, "inprogress_meter", "function incr(e){var t=e.split(\":\"),r=document.getElementById(\"progress\").getElementsByTagName(\"meter\");r[0].setAttribute(\"value\",t[0]),r[0].setAttribute(\"max\",t[1])}", nullptr },
   { AC_Element, "inprogress_loader", "function incr(pv){}", nullptr },
   { AC_Element, "c7", "</script>", nullptr },