diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c776b87b..cfbf9a82 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -41,10 +41,10 @@ jobs: run: | mkdir espbinaries - - name: Zip web files - run: | - cd /home/runner/work/OpenEPaperLink/OpenEPaperLink/ESP32_AP-Flasher - python gzip_wwwfiles.py +# - name: Zip web files +# run: | +# cd /home/runner/work/OpenEPaperLink/OpenEPaperLink/ESP32_AP-Flasher +# python gzip_wwwfiles.py - name: Build firmware for Simple_AP run: | diff --git a/ESP32_AP-Flasher/data/www/main.js.gz b/ESP32_AP-Flasher/data/www/main.js.gz index 218fc04d..87a551ef 100644 Binary files a/ESP32_AP-Flasher/data/www/main.js.gz and b/ESP32_AP-Flasher/data/www/main.js.gz differ diff --git a/ESP32_AP-Flasher/src/web.cpp b/ESP32_AP-Flasher/src/web.cpp index 66672aa9..99d5223b 100644 --- a/ESP32_AP-Flasher/src/web.cpp +++ b/ESP32_AP-Flasher/src/web.cpp @@ -238,7 +238,7 @@ void init_web() { }); server.serveStatic("/current", *contentFS, "/current/").setCacheControl("max-age=604800"); - server.serveStatic("/tagtypes", *contentFS, "/tagtypes/").setCacheControl("max-age=604800"); + server.serveStatic("/tagtypes", *contentFS, "/tagtypes/").setCacheControl("max-age=600"); server.serveStatic("/", *contentFS, "/www/").setDefaultFile("index.html"); server.on( diff --git a/ESP32_AP-Flasher/wwwroot/main.js b/ESP32_AP-Flasher/wwwroot/main.js index a7e594ee..c38bd053 100644 --- a/ESP32_AP-Flasher/wwwroot/main.js +++ b/ESP32_AP-Flasher/wwwroot/main.js @@ -1072,8 +1072,8 @@ function GroupSortFilter() { let grouping = document.querySelector('input[name="group"]:checked')?.value; if (grouping == undefined) { - grouping = localStorage.getItem("grouping") + ""; - document.querySelector('input[name="group"][value="' + grouping + '"]').checked = true + grouping = localStorage.getItem("grouping"); + if (grouping) document.querySelector('input[name="group"][value="' + grouping + '"]').checked = true } else { localStorage.setItem("grouping", grouping); }