Skip to content

Commit e665e4d

Browse files
committed
Merge branch 'master' of https://github.com/Aircoookie/WLED
2 parents 9551519 + df51b80 commit e665e4d

File tree

3 files changed

+40
-36
lines changed

3 files changed

+40
-36
lines changed

wled00/data/index.js

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1334,10 +1334,13 @@ function lock(e) {
13341334

13351335
function move(e) {
13361336
if(!locked || pcMode) return;
1337-
var dx = unify(e).clientX - x0, s = Math.sign(dx),
1338-
f = +(s*dx/w).toFixed(2);
1337+
var clientX = unify(e).clientX;
1338+
var dx = clientX - x0;
1339+
var s = Math.sign(dx);
1340+
var f = +(s*dx/w).toFixed(2);
13391341

1340-
if((iSlide > 0 || s < 0) && (iSlide < N - 1 || s > 0) &&
1342+
if((clientX != 0) &&
1343+
(iSlide > 0 || s < 0) && (iSlide < N - 1 || s > 0) &&
13411344
f > 0.12 &&
13421345
d.getElementsByClassName("tabcontent")[iSlide].scrollTop == scrollS) {
13431346
_C.style.setProperty('--i', iSlide -= s);

wled00/html_settings.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -364,10 +364,10 @@ HTTP traffic is unencrypted. An attacker in the same network can intercept form
364364
</button><br>Enable ArduinoOTA: <input type="checkbox" name="AO"><br><h3>About
365365
</h3><a href="https://github.com/Aircoookie/WLED/" target="_blank">WLED</a>
366366
version 0.11.1<br><br><a
367-
href="https://github.com/Aircoookie/WLED/wiki/Contributors-&-About"
367+
href="https://github.com/Aircoookie/WLED/wiki/Contributors-and-credits"
368368
target="_blank">Contributors, dependencies and special thanks</a><br>
369369
A huge thank you to everyone who helped me create WLED!<br><br>
370-
(c) 2016-2020 Christian Schwinne<br><i>Licensed under the <a
370+
(c) 2016-2021 Christian Schwinne<br><i>Licensed under the <a
371371
href="https://github.com/Aircoookie/WLED/blob/master/LICENSE" target="_blank">
372372
MIT license</a></i><br><br>Server message: <span class="sip">Response error!
373373
</span><hr><button type="button" onclick="B()">Back</button><button

wled00/html_ui.h

Lines changed: 32 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*/
88

99
// Autogenerated from wled00/data/index.htm, do not edit!!
10-
const uint16_t PAGE_index_L = 32718;
10+
const uint16_t PAGE_index_L = 32722;
1111
const uint8_t PAGE_index[] PROGMEM = {
1212
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x0a, 0xcc, 0xbd, 0x69, 0x7b, 0xe2, 0x48,
1313
0xb2, 0x28, 0xfc, 0xbd, 0x7e, 0x05, 0x45, 0x4d, 0x57, 0x43, 0x21, 0x40, 0xac, 0xc6, 0xb8, 0x68,
@@ -2024,34 +2024,35 @@ const uint8_t PAGE_index[] PROGMEM = {
20242024
0x47, 0x18, 0x24, 0x08, 0x26, 0x53, 0x4e, 0x95, 0x0c, 0x8c, 0x9c, 0x4f, 0xec, 0xce, 0x18, 0x26,
20252025
0x13, 0x6e, 0xa3, 0x69, 0xda, 0xd7, 0x7c, 0x61, 0x6e, 0x0a, 0x7b, 0x81, 0x3d, 0x71, 0x44, 0x2c,
20262026
0xb9, 0x5c, 0xae, 0x6d, 0xab, 0x32, 0x27, 0x0c, 0x9b, 0x2d, 0xa6, 0x84, 0xe7, 0x38, 0x3e, 0x2e,
2027-
0x4d, 0x4d, 0xb9, 0xa7, 0xad, 0x47, 0x57, 0xc6, 0x8d, 0x20, 0x47, 0xf9, 0x19, 0xda, 0x9a, 0x9e,
2028-
0x58, 0xd1, 0xab, 0xac, 0xf3, 0x50, 0xb8, 0x43, 0xed, 0xd9, 0x03, 0x11, 0xe2, 0x64, 0xe8, 0x02,
2029-
0x56, 0xb8, 0x20, 0xcf, 0x12, 0x3c, 0xe1, 0xe2, 0x14, 0x12, 0xc8, 0xd5, 0x44, 0x3a, 0x6c, 0x77,
2030-
0x7b, 0xc7, 0xc7, 0xdf, 0x3a, 0x64, 0xd8, 0xb3, 0x7c, 0xd2, 0xa0, 0xea, 0xbd, 0x41, 0x52, 0x5a,
2031-
0x5e, 0x84, 0x1d, 0xed, 0xb6, 0xd2, 0x72, 0xb4, 0x14, 0x11, 0x44, 0xa5, 0x39, 0xd0, 0x0a, 0x9c,
2032-
0x3d, 0xa9, 0x7d, 0xe8, 0xfc, 0x76, 0xa1, 0x22, 0xb1, 0x59, 0x94, 0x69, 0xe6, 0xca, 0xcd, 0x9b,
2033-
0x07, 0x19, 0x69, 0x8a, 0x10, 0x17, 0xc5, 0xce, 0x6e, 0x34, 0xbf, 0x87, 0xf3, 0xa7, 0x64, 0xbc,
2034-
0x31, 0xc8, 0x03, 0x43, 0xa2, 0x6b, 0xd4, 0x13, 0x53, 0x0f, 0x4a, 0xb9, 0xa8, 0xd5, 0x53, 0x8e,
2035-
0xb3, 0x52, 0x25, 0xa2, 0x18, 0xaa, 0x5f, 0xe3, 0x65, 0xb2, 0xe5, 0x9d, 0x29, 0x01, 0x27, 0x93,
2036-
0xa2, 0x5e, 0x2d, 0x84, 0x50, 0xd5, 0xae, 0x81, 0xa7, 0x33, 0x8a, 0x27, 0x43, 0xfe, 0xaf, 0x65,
2037-
0x50, 0x61, 0xf1, 0xd0, 0xe0, 0x47, 0x18, 0xe3, 0x13, 0xc9, 0x00, 0xc4, 0xb6, 0x8c, 0x49, 0x9c,
2038-
0xbf, 0x3f, 0x5c, 0x74, 0x29, 0xaa, 0xc5, 0x91, 0x0c, 0xb3, 0x73, 0x44, 0x64, 0xba, 0x48, 0xa5,
2039-
0x60, 0xc5, 0xf4, 0xfc, 0xfc, 0xfc, 0x30, 0xf4, 0x94, 0x44, 0xfe, 0x82, 0x3b, 0x4b, 0x86, 0xdc,
2040-
0x21, 0x1f, 0xc2, 0xa2, 0xbe, 0x51, 0x1e, 0xfa, 0xb8, 0x2f, 0x5a, 0x42, 0xd7, 0x1b, 0x79, 0x9f,
2041-
0x8b, 0xe6, 0xab, 0xf1, 0xa6, 0x1a, 0x9d, 0x5f, 0x60, 0x98, 0x25, 0x45, 0xf5, 0x9b, 0x57, 0xb1,
2042-
0xcf, 0x8b, 0x45, 0x5c, 0x10, 0x94, 0x0b, 0x5a, 0x0b, 0x2f, 0x8f, 0x08, 0x54, 0xb8, 0xc7, 0xa6,
2043-
0x00, 0xc4, 0x23, 0x13, 0x23, 0x8a, 0xa2, 0xe2, 0xa0, 0xf9, 0xad, 0x0b, 0x9c, 0x03, 0x33, 0x67,
2044-
0x6e, 0xc9, 0x1e, 0x22, 0xdd, 0x0a, 0x55, 0x9f, 0xe1, 0x1f, 0x11, 0xfe, 0xf9, 0x41, 0x59, 0xdd,
2045-
0xdc, 0x4d, 0xb8, 0x82, 0xc4, 0xe1, 0xe2, 0x16, 0x53, 0x22, 0x5e, 0xd9, 0x9e, 0x12, 0x16, 0xcf,
2046-
0x30, 0xed, 0xe8, 0xdd, 0x6a, 0xe5, 0x3f, 0xb5, 0x83, 0x94, 0xfe, 0x6a, 0xe2, 0x98, 0x22, 0xf8,
2047-
0x18, 0x73, 0xda, 0xed, 0xb6, 0x34, 0x9a, 0x16, 0xf8, 0x3b, 0x27, 0x16, 0x45, 0xa8, 0x69, 0x64,
2048-
0x86, 0x4a, 0x2b, 0x5c, 0xc8, 0xa7, 0xf4, 0xe0, 0xf8, 0x38, 0x7f, 0x89, 0xec, 0xc2, 0x33, 0x32,
2049-
0x8f, 0x8b, 0x12, 0xd9, 0xc5, 0x47, 0x38, 0x08, 0xec, 0x11, 0x9d, 0x07, 0xcf, 0xcf, 0x7a, 0x14,
2050-
0x0f, 0xe6, 0x6c, 0x20, 0x15, 0x83, 0x29, 0xdb, 0x8e, 0xd2, 0x2d, 0x48, 0x73, 0xa8, 0x94, 0xdd,
2051-
0xaf, 0xcd, 0x8f, 0xdf, 0xb6, 0x39, 0x0d, 0x5e, 0x19, 0xcf, 0x56, 0x84, 0xec, 0x6a, 0x42, 0x18,
2052-
0x91, 0xe9, 0xc0, 0xae, 0x12, 0x5b, 0xbd, 0x1a, 0xdf, 0x0a, 0x08, 0x23, 0x28, 0xcf, 0x2d, 0x1e,
2053-
0x64, 0x84, 0xa7, 0x6a, 0xae, 0x65, 0x8c, 0xa2, 0xa1, 0xf8, 0x21, 0xa2, 0x30, 0x70, 0x77, 0xcd,
2054-
0x19, 0xd5, 0xe0, 0x5a, 0xbb, 0x73, 0x52, 0x95, 0x31, 0x46, 0xed, 0x42, 0xb4, 0xbf, 0x27, 0xdf,
2055-
0x3a, 0xd9, 0x97, 0xad, 0x88, 0xd3, 0x25, 0xf3, 0xa9, 0x81, 0xd8, 0x3b, 0xe8, 0x1f, 0x00, 0xff,
2056-
0x2e, 0xb2, 0x65, 0x38, 0xfc, 0x5f, 0x96, 0x26, 0x74, 0x71, 0xd8, 0x71, 0x01, 0x00
2027+
0x4d, 0x4d, 0xa5, 0xa7, 0x91, 0x97, 0xb5, 0x1e, 0x5d, 0x19, 0x25, 0x82, 0x9c, 0xe5, 0x47, 0x18,
2028+
0x15, 0xe2, 0xc4, 0x4a, 0x5f, 0x45, 0x9d, 0x87, 0xc2, 0x25, 0x6a, 0x2f, 0xf7, 0xc9, 0xcc, 0x7b,
2029+
0x3b, 0x74, 0x9f, 0x9f, 0xd3, 0x0b, 0xf2, 0x31, 0xc1, 0x13, 0x2e, 0x4e, 0x21, 0x81, 0x9c, 0x4e,
2030+
0x84, 0xc3, 0x76, 0xb7, 0x77, 0x7c, 0xfc, 0xad, 0x83, 0x87, 0xdd, 0xcb, 0xa7, 0x0f, 0xaa, 0xde,
2031+
0x1b, 0x2e, 0xa5, 0x85, 0xfc, 0xa7, 0xd0, 0xeb, 0xb6, 0xc2, 0x72, 0xdc, 0x14, 0x11, 0x4e, 0xa5,
2032+
0x39, 0xe4, 0xca, 0x0c, 0x9d, 0x7e, 0x1e, 0x3a, 0xd3, 0x5d, 0xa8, 0x48, 0x6c, 0x1b, 0x65, 0xc2,
2033+
0xb9, 0x9a, 0xf3, 0xe6, 0x41, 0xc6, 0x9c, 0x22, 0x14, 0x46, 0x51, 0xb4, 0x1b, 0x0d, 0xf1, 0xe1,
2034+
0x24, 0x2a, 0x99, 0x71, 0x0c, 0xf2, 0x10, 0x91, 0xe8, 0x24, 0xf5, 0xc4, 0xd4, 0xc3, 0x53, 0x2e,
2035+
0x6a, 0x35, 0x96, 0xe3, 0xac, 0x54, 0x89, 0x28, 0x86, 0x8a, 0xd8, 0x78, 0xad, 0x6c, 0x79, 0x67,
2036+
0x4a, 0xe8, 0xc9, 0xa4, 0xa8, 0x57, 0x0b, 0x26, 0x54, 0xb5, 0x70, 0xe0, 0xe9, 0x8c, 0x22, 0xcb,
2037+
0x90, 0x27, 0x6c, 0x19, 0x5e, 0x58, 0x3c, 0x34, 0x78, 0x14, 0xc6, 0x48, 0x45, 0x32, 0x14, 0xb1,
2038+
0x2d, 0xa3, 0x13, 0xe7, 0xef, 0x0f, 0x17, 0x5d, 0x8a, 0x6f, 0x71, 0x24, 0x03, 0xee, 0x1c, 0x11,
2039+
0xc1, 0x2e, 0x52, 0x29, 0x6c, 0x31, 0x3d, 0x3f, 0x3f, 0x3f, 0x0c, 0x3d, 0x25, 0x91, 0xbf, 0xe0,
2040+
0x1e, 0x93, 0xc1, 0x77, 0xc8, 0x9b, 0xb0, 0xa8, 0x6f, 0x94, 0x07, 0x41, 0xee, 0x8b, 0x96, 0xd0,
2041+
0x09, 0x47, 0xde, 0xe7, 0xa2, 0xf9, 0x6a, 0xe4, 0xa9, 0x46, 0x37, 0x18, 0x18, 0x70, 0x49, 0x51,
2042+
0x02, 0xe7, 0x55, 0xec, 0xf3, 0x67, 0x11, 0x17, 0xa4, 0xe5, 0x82, 0xd6, 0xc2, 0xcb, 0x63, 0x03,
2043+
0x15, 0x8e, 0xb2, 0x29, 0x14, 0xf1, 0xc8, 0xc4, 0xd8, 0xa2, 0xa8, 0x42, 0x68, 0x7e, 0xeb, 0x02,
2044+
0xe7, 0xc0, 0xcc, 0xd9, 0x5c, 0xb2, 0x87, 0x48, 0xc1, 0x42, 0xd5, 0x67, 0xf8, 0x47, 0x04, 0x82,
2045+
0x7e, 0x50, 0x56, 0x37, 0x77, 0x18, 0xae, 0xa0, 0x73, 0xb8, 0xc2, 0xc5, 0x94, 0x88, 0x97, 0xb7,
2046+
0xa7, 0x84, 0xc5, 0x33, 0x4c, 0x3b, 0x7a, 0xb7, 0x5a, 0xf9, 0x4f, 0xed, 0x20, 0xa5, 0xbf, 0x9a,
2047+
0x60, 0xa6, 0x08, 0x43, 0xc6, 0x9c, 0x76, 0xbb, 0x2d, 0xcd, 0xa7, 0x05, 0x26, 0xcf, 0xc9, 0x46,
2048+
0x11, 0x74, 0x1a, 0xd9, 0xa2, 0xd2, 0x1e, 0x17, 0xf2, 0x29, 0x3d, 0x38, 0x3e, 0xce, 0x5f, 0x22,
2049+
0xbb, 0xf0, 0x91, 0xcc, 0x23, 0xa4, 0x44, 0x76, 0xf1, 0x11, 0x8e, 0x04, 0x7b, 0x44, 0x27, 0xc3,
2050+
0xf3, 0xb3, 0x1e, 0xcf, 0x83, 0x39, 0x1b, 0x48, 0xc5, 0xb0, 0xca, 0xb6, 0xa3, 0x74, 0x0b, 0xd2,
2051+
0x1c, 0x2a, 0x65, 0xf7, 0x6b, 0xf3, 0xe3, 0xb7, 0x6d, 0x4e, 0x8d, 0x57, 0xc6, 0xb3, 0x15, 0xc1,
2052+
0xbb, 0x9a, 0x10, 0x46, 0x64, 0x3a, 0xb0, 0xab, 0xc4, 0x56, 0xaf, 0x46, 0xba, 0x02, 0x12, 0x09,
2053+
0xca, 0x73, 0xdb, 0x07, 0x19, 0xeb, 0xa9, 0x9a, 0x6b, 0x19, 0xa3, 0x90, 0x28, 0x7e, 0x88, 0x28,
2054+
0x20, 0xdc, 0x5d, 0x73, 0x46, 0x35, 0xcc, 0xd6, 0xee, 0x9c, 0x54, 0x65, 0x8c, 0xf1, 0xbb, 0xf0,
2055+
0x00, 0xd8, 0x93, 0x6f, 0x9d, 0xec, 0xcb, 0x56, 0x44, 0xec, 0x92, 0xf9, 0xd4, 0x90, 0xec, 0x1d,
2056+
0xf4, 0x14, 0x80, 0x7f, 0x17, 0xd9, 0x32, 0x1c, 0xfe, 0x2f, 0xca, 0xb4, 0x0b, 0x8c, 0xe2, 0x71,
2057+
0x01, 0x00
20572058
};

0 commit comments

Comments
 (0)