From 47f24ac1516536cfdf51138fadc5815f7634c811 Mon Sep 17 00:00:00 2001 From: jbucky86 <47157305+jbucky86@users.noreply.github.com> Date: Mon, 3 Aug 2020 12:37:25 -0400 Subject: [PATCH] dmx_htm_fixes (#1070) * Update cdata.js * Update html_settings.h * Update settings.htm * Update settings_dmx.htm * Add %DMXMENU% to cdata.js * Fix single % being treated as template in settings.htm Co-authored-by: cschwinne --- package-lock.json | 2 +- tools/cdata.js | 4 ++++ wled00/data/settings_dmx.htm | 7 +++++-- wled00/dmx.cpp | 4 ++++ wled00/html_settings.h | 22 +++++++++++----------- 5 files changed, 25 insertions(+), 14 deletions(-) diff --git a/package-lock.json b/package-lock.json index d44c4c77f8..f22b3f956f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "wled", - "version": "0.10.0", + "version": "0.10.1", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/tools/cdata.js b/tools/cdata.js index 4bf2bba3a7..3d1c79c75c 100644 --- a/tools/cdata.js +++ b/tools/cdata.js @@ -202,6 +202,10 @@ writeChunks( append: ")=====", method: "plaintext", filter: "html-minify", + mangle: (str) => + str + .replace("%", "%%") + .replace(/User Interface\<\/button\>\<\/form\>/gms, "User Interface\<\/button\>\<\/form\>%DMXMENU%"), }, { file: "settings_wifi.htm", diff --git a/wled00/data/settings_dmx.htm b/wled00/data/settings_dmx.htm index e8610062bc..5438b9e649 100644 --- a/wled00/data/settings_dmx.htm +++ b/wled00/data/settings_dmx.htm @@ -31,6 +31,9 @@ function S(){GCH(15);GetV();mMap();}function H(){window.open("https://github.com/Aircoookie/WLED/wiki/DMX");}function B(){window.history.back();} function GetV(){} +
@@ -48,9 +51,9 @@

Imma firin ma lazer (if it has DMX support)