diff --git a/tools/cdata.js b/tools/cdata.js
index 09816f959..bb9854608 100644
--- a/tools/cdata.js
+++ b/tools/cdata.js
@@ -380,16 +380,6 @@ const char PAGE_dmxmap[] PROGMEM = R"=====()=====";
file: "favicon.ico",
name: "favicon",
method: "binary",
- },
- {
- file: "iro.js",
- name: "iroJs",
- method: "gzip"
- },
- {
- file: "rangetouch.js",
- name: "rangetouchJs",
- method: "gzip"
}
],
"wled00/html_other.h"
diff --git a/wled00/data/index.htm b/wled00/data/index.htm
index 8dd26b7b7..ae685bdb9 100644
--- a/wled00/data/index.htm
+++ b/wled00/data/index.htm
@@ -7,52 +7,9 @@
WLED
-
-
+
Loading WLED UI...
@@ -378,6 +335,13 @@
+
+
+
+
diff --git a/wled00/data/index.js b/wled00/data/index.js
index 3fed6d20e..b33ea53ed 100644
--- a/wled00/data/index.js
+++ b/wled00/data/index.js
@@ -15,6 +15,7 @@ var pcMode = false, pcModeA = false, lastw = 0, wW;
var simplifiedUI = false;
var tr = 7;
var d = document;
+const ranges = RangeTouch.setup('input[type="range"]', {});
var palettesData;
var fxdata = [];
var pJson = {}, eJson = {}, lJson = {};
@@ -23,7 +24,7 @@ var pN = "", pI = 0, pNum = 0;
var pmt = 1, pmtLS = 0, pmtLast = 0;
var lastinfo = {};
var isM = false, mw = 0, mh=0;
-var ws, cpick, ranges, wsRpt=0;
+var ws, wsRpt=0;
var cfg = {
theme:{base:"dark", bg:{url:"", rnd: false, rndGrayscale: false, rndBlur: false}, alpha:{bg:0.6,tab:0.8}, color:{bg:""}},
comp :{colors:{picker: true, rgb: false, quick: true, hex: false},
@@ -39,6 +40,17 @@ var hol = [
[0,0,1,1,"https://images.alphacoders.com/119/1198800.jpg"] // new year
];
+var cpick = new iro.ColorPicker("#picker", {
+ width: 260,
+ wheelLightness: false,
+ wheelAngle: 270,
+ wheelDirection: "clockwise",
+ layout: [{
+ component: iro.ui.Wheel,
+ options: {}
+ }]
+});
+
function handleVisibilityChange() {if (!d.hidden && new Date () - lastUpdate > 3000) requestJson();}
function sCol(na, col) {d.documentElement.style.setProperty(na, col);}
function gId(c) {return d.getElementById(c);}
@@ -260,6 +272,8 @@ function onLoad()
selectSlot(0);
updateTablinks(0);
+ cpick.on("input:end", () => {setColor(1);});
+ cpick.on("color:change", () => {updatePSliders()});
pmtLS = localStorage.getItem('wledPmt');
// Load initial data
diff --git a/wled00/wled.h b/wled00/wled.h
index 6204a3d78..868403d3d 100644
--- a/wled00/wled.h
+++ b/wled00/wled.h
@@ -8,7 +8,7 @@
*/
// version code in format yymmddb (b = daily build)
-#define VERSION 2312160
+#define VERSION 2312190
//uncomment this if you have a "my_config.h" file you'd like to use
//#define WLED_USE_MY_CONFIG
diff --git a/wled00/wled_server.cpp b/wled00/wled_server.cpp
index f5152fe99..7d9d1a1ec 100644
--- a/wled00/wled_server.cpp
+++ b/wled00/wled_server.cpp
@@ -254,22 +254,6 @@ void initServer()
size_t len, bool final) {handleUpload(request, filename, index, data, len, final);}
);
- server.on("/iro.js", HTTP_GET, [](AsyncWebServerRequest *request){
- if (handleIfNoneMatchCacheHeader(request)) return;
- AsyncWebServerResponse *response = request->beginResponse_P(200, "application/javascript", iroJs, iroJs_length);
- response->addHeader(FPSTR(s_content_enc),"gzip");
- setStaticContentCacheHeaders(response);
- request->send(response);
- });
-
- server.on("/rangetouch.js", HTTP_GET, [](AsyncWebServerRequest *request){
- if (handleIfNoneMatchCacheHeader(request)) return;
- AsyncWebServerResponse *response = request->beginResponse_P(200, "application/javascript", rangetouchJs, rangetouchJs_length);
- response->addHeader(FPSTR(s_content_enc),"gzip");
- setStaticContentCacheHeaders(response);
- request->send(response);
- });
-
createEditHandler(correctPIN);
#ifndef WLED_DISABLE_OTA