diff --git a/public/assets/boot/ctrl_boot_backoffice.js b/public/assets/boot/ctrl_boot_backoffice.js index bb2f7c29..f13c8c01 100644 --- a/public/assets/boot/ctrl_boot_backoffice.js +++ b/public/assets/boot/ctrl_boot_backoffice.js @@ -1,4 +1,3 @@ -import { init as initCSS } from "../helpers/loader.js"; import { report } from "../helpers/log.js"; import { $error } from "./common.js"; @@ -8,7 +7,6 @@ export default async function main() { setup_device(), setup_blue_death_screen(), setup_history(), - setup_css(), ]); window.dispatchEvent(new window.Event("pagechange")); } catch (err) { @@ -35,7 +33,3 @@ async function setup_blue_death_screen() { async function setup_history() { window.history.replaceState({}, ""); } - -async function setup_css() { - return initCSS(); -} diff --git a/public/assets/boot/ctrl_boot_frontoffice.js b/public/assets/boot/ctrl_boot_frontoffice.js index 9feaea17..e73c7a74 100644 --- a/public/assets/boot/ctrl_boot_frontoffice.js +++ b/public/assets/boot/ctrl_boot_frontoffice.js @@ -1,5 +1,5 @@ import { toHref } from "../lib/skeleton/router.js"; -import { init as setup_loader, loadJS } from "../helpers/loader.js"; +import { loadJS } from "../helpers/loader.js"; import { init as setup_translation } from "../locales/index.js"; import { init as setup_config } from "../model/config.js"; import { init as setup_chromecast } from "../model/chromecast.js"; @@ -14,7 +14,6 @@ export default async function main() { setup_device(), // setup_sw(), // TODO setup_blue_death_screen(), - setup_loader(), setup_history(), ]); @@ -69,7 +68,7 @@ async function setup_device() { }); } -async function setup_sw() { +async function setup_sw() { // eslint-disable-line no-unused-vars if (!("serviceWorker" in window.navigator)) return; if (window.navigator.userAgent.indexOf("Mozilla/") !== -1 && @@ -93,7 +92,7 @@ async function setup_blue_death_screen() { if ("serviceWorker" in navigator) navigator.serviceWorker .getRegistrations() .then((registrations) => { - for (let registration of registrations) { + for (const registration of registrations) { registration.unregister(); } }); diff --git a/public/assets/helpers/loader.js b/public/assets/helpers/loader.js index bf9a7a8a..118ded60 100644 --- a/public/assets/helpers/loader.js +++ b/public/assets/helpers/loader.js @@ -1,10 +1,6 @@ -import { get as getRelease } from "../pages/adminpage/model_release.js"; - -let version = null; - export async function loadJS(baseURL, path, opts = {}) { const $script = document.createElement("script"); - const link = new URL(path, baseURL) + (version ? "?version=" + version : ""); + const link = new URL(path, baseURL); $script.setAttribute("src", link.toString()); for (const key in opts) { $script.setAttribute(key, opts[key]); @@ -19,7 +15,7 @@ export async function loadJS(baseURL, path, opts = {}) { export async function loadCSS(baseURL, path) { const $style = document.createElement("link"); - const link = new URL(path, baseURL) + "?version=" + version; + const link = new URL(path, baseURL); $style.setAttribute("href", link.toString()); $style.setAttribute("rel", "stylesheet"); if (document.head.querySelector(`[href="${link.toString()}"]`)) return Promise.resolve(); @@ -31,7 +27,7 @@ export async function loadCSS(baseURL, path) { } export async function loadCSSInline(baseURL, filename) { - const res = await fetch(new URL(filename, baseURL).pathname + `?version=${version}`, { + const res = await fetch(new URL(filename, baseURL).pathname, { cache: "force-cache", }); if (res.status !== 200) return `/* ERROR: ${res.status} */`; @@ -43,8 +39,3 @@ export async function CSS(baseURL, ...arrayOfFilenames) { const sheets = await Promise.all(arrayOfFilenames.map((filename) => loadCSSInline(baseURL, filename))); return sheets.join("\n\n"); } - -export async function init() { - const info = await getRelease().toPromise(); - version = info.version; -} diff --git a/public/index.backoffice.html b/public/index.backoffice.html index 3459d285..bc37e721 100644 --- a/public/index.backoffice.html +++ b/public/index.backoffice.html @@ -5,12 +5,12 @@ - + Admin Console - +
@@ -20,13 +20,13 @@ import routes from "./admin/assets/{{ .version }}/boot/router_backoffice.js"; main(document.getElementById("app"), routes, { spinner: ``, - beforeStart: import("./admin/assets/{{ .version }}/boot/ctrl_boot_backoffice.js"), + beforeStart: import("{{ .base }}admin/assets/{{ .version }}/boot/ctrl_boot_backoffice.js"), }); - + - +