From 712e05479b84b3bc9d95e3345b6cd866fb3c2519 Mon Sep 17 00:00:00 2001 From: Blaz Kristan Date: Wed, 8 Dec 2021 22:05:51 +0100 Subject: [PATCH] Cleanup. Bugfixes. Changed links to point to kno.wled.ge --- tools/cdata.js | 48 +- wled00/data/settings_leds.htm | 19 +- wled00/data/settings_sec.htm | 2 +- wled00/data/settings_sync.htm | 31 +- wled00/data/settings_time.htm | 18 +- wled00/data/settings_ui.htm | 8 +- wled00/data/settings_wifi.htm | 16 +- wled00/data/style.css | 12 + wled00/html_other.h | 1496 ++++++++-------- wled00/html_settings.h | 2270 +++++++++++------------ wled00/html_simple.h | 614 +++---- wled00/html_ui.h | 3173 ++++++++++++++++----------------- wled00/set.cpp | 6 +- 13 files changed, 3834 insertions(+), 3879 deletions(-) diff --git a/tools/cdata.js b/tools/cdata.js index adb558bb..7c50d0a2 100644 --- a/tools/cdata.js +++ b/tools/cdata.js @@ -113,7 +113,7 @@ function writeHtmlGzipped(sourceFile, resultFile, page) { console.info("Reading " + sourceFile); new inliner(sourceFile, function (error, html) { console.info("Inlined " + html.length + " characters"); - html = filter(html/*.replace("","")*/, "html-minify-ui"); + html = filter(html, "html-minify-ui"); console.info("Minified to " + html.length + " characters"); if (error) { @@ -252,8 +252,6 @@ writeChunks( { file: "style.css", name: "PAGE_settingsCss", - prepend: "=====()=====", method: "gzip", filter: "css-minify", mangle: (str) => @@ -271,14 +269,10 @@ writeChunks( { file: "settings_wifi.htm", name: "PAGE_settings_wifi", - prepend: "=====(", - append: ")=====", method: "gzip", filter: "html-minify", mangle: (str) => str - //.replace(/\/gms, "") - //.replace(/\.*\<\/style\>/gms, "%CSS%%SCSS%") .replace( /function GetV().*\<\/script\>/gms, "" @@ -287,14 +281,10 @@ writeChunks( { file: "settings_leds.htm", name: "PAGE_settings_leds", - prepend: "=====(", - append: ")=====", method: "gzip", filter: "html-minify", mangle: (str) => str - //.replace(/\/gms, "") - //.replace(/\.*\<\/style\>/gms, "%SCSS%") .replace( /function GetV().*\<\/script\>/gms, "" @@ -303,14 +293,10 @@ writeChunks( { file: "settings_dmx.htm", name: "PAGE_settings_dmx", - prepend: "=====(", - append: ")=====", method: "gzip", filter: "html-minify", mangle: (str) => str - //.replace(/\/gms, "") - //.replace(/\.*\<\/style\>/gms, "%CSS%%SCSS%") .replace( /function GetV().*\<\/script\>/gms, "" @@ -319,14 +305,10 @@ writeChunks( { file: "settings_ui.htm", name: "PAGE_settings_ui", - prepend: "=====(", - append: ")=====", method: "gzip", filter: "html-minify", mangle: (str) => str - //.replace(/\/gms, "") - //.replace(/\.*\<\/style\>/gms, "%CSS%%SCSS%") .replace( /function GetV().*\<\/script\>/gms, "" @@ -335,14 +317,10 @@ writeChunks( { file: "settings_sync.htm", name: "PAGE_settings_sync", - prepend: "=====(", - append: ")=====", method: "gzip", filter: "html-minify", mangle: (str) => str - //.replace(/\/gms, "") - //.replace(/\.*\<\/style\>/gms, "%CSS%%SCSS%") .replace( /function GetV().*\<\/script\>/gms, "" @@ -351,14 +329,10 @@ writeChunks( { file: "settings_time.htm", name: "PAGE_settings_time", - prepend: "=====(", - append: ")=====", method: "gzip", filter: "html-minify", mangle: (str) => str - //.replace(/\/gms, "") - //.replace(/\.*\<\/style\>/gms, "%CSS%%SCSS%") .replace( /function GetV().*\<\/script\>/gms, "" @@ -367,14 +341,10 @@ writeChunks( { file: "settings_sec.htm", name: "PAGE_settings_sec", - prepend: "=====(", - append: ")=====", method: "gzip", filter: "html-minify", mangle: (str) => str - //.replace(/\/gms, "") - //.replace(/\.*\<\/style\>/gms, "%CSS%%SCSS%") .replace( /function GetV().*\<\/script\>/gms, "" @@ -383,14 +353,10 @@ writeChunks( { file: "settings_um.htm", name: "PAGE_settings_um", - prepend: "=====(", - append: ")=====", method: "gzip", filter: "html-minify", mangle: (str) => str - //.replace(/\/gms, "") - //.replace(/\.*\<\/style\>/gms, "%CSS%%SCSS%") .replace( /function GetV().*\<\/script\>/gms, "" @@ -406,8 +372,6 @@ writeChunks( { file: "usermod.htm", name: "PAGE_usermod", - prepend: "=====(", - append: ")=====", method: "gzip", filter: "html-minify", mangle: (str) => @@ -440,40 +404,30 @@ const char PAGE_dmxmap[] PROGMEM = R"=====()====="; { file: "update.htm", name: "PAGE_update", - prepend: "=====(", - append: ")=====", method: "gzip", filter: "html-minify", }, { file: "welcome.htm", name: "PAGE_welcome", - prepend: "=====(", - append: ")=====", method: "gzip", filter: "html-minify", }, { file: "liveview.htm", name: "PAGE_liveview", - prepend: "=====(", - append: ")=====", method: "gzip", filter: "html-minify", }, { file: "liveviewws.htm", name: "PAGE_liveviewws", - prepend: "=====(", - append: ")=====", method: "gzip", filter: "html-minify", }, { file: "404.htm", name: "PAGE_404", - prepend: "=====(", - append: ")=====", method: "gzip", filter: "html-minify", }, diff --git a/wled00/data/settings_leds.htm b/wled00/data/settings_leds.htm index 5351452a..779e110a 100644 --- a/wled00/data/settings_leds.htm +++ b/wled00/data/settings_leds.htm @@ -8,18 +8,10 @@