From b88a4bcb88a726fa17d1beeea552685039454f2b Mon Sep 17 00:00:00 2001 From: Danny Lin Date: Sat, 23 Jan 2021 17:53:22 -0800 Subject: [PATCH] Update web install for fastboot.js and zip.js updates --- static/js/web-install.js | 4 +++- static/web-install.html | 12 ++++++------ validate_static | 2 +- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/static/js/web-install.js b/static/js/web-install.js index f4ee0c8d..aa80d2b1 100644 --- a/static/js/web-install.js +++ b/static/js/web-install.js @@ -87,7 +87,9 @@ function addButtonHook(id, callback) { // zip.js is loaded separately. // eslint-disable-next-line no-undef zip.configure({ - workerScriptsPath: "/js/fastboot/libs/", + workerScripts: { + inflate: ["/js/fastboot/libs/z-worker-pako.js", "pako_inflate.min.js"], + }, }); if ("usb" in navigator) { diff --git a/static/web-install.html b/static/web-install.html index 9ac73ddc..6e9481ac 100644 --- a/static/web-install.html +++ b/static/web-install.html @@ -26,12 +26,12 @@ - - - - - - + + + + + +
diff --git a/validate_static b/validate_static index a14ac101..cbf21c47 100755 --- a/validate_static +++ b/validate_static @@ -14,6 +14,6 @@ for file in static_tmp/**/*.@(json|webmanifest); do done xmllint --noout static_tmp/**/*.@(html|svg|xml) -eslint static_tmp/**/!(zip.min|z-worker).js +eslint static_tmp/**/!(zip-inflate.min|z-worker-pako|pako_inflate.min).js stylelint static_tmp/**/*.css validatornu --Werror --also-check-css --also-check-svg static_tmp/**/*.@(css|html|svg)