Skip to content

Commit 8a762a7

Browse files
klein0rklein0r
committed
chore: release v7.6.3
* (klein0r) Fixed bug in formatTimeDiff Blockly
1 parent 603069a commit 8a762a7

31 files changed

+59
-54
lines changed

‎CHANGELOG_OLD.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
11
The newest change log is in README.md
2+
## 7.4.0 (2023-12-08)
3+
4+
* (klein0r) Download script as xml file (export)
5+
* (klein0r) Import script as file (upload)
6+
* (klein0r) Hide global folder if expert mode is disabled
7+
28
## 7.3.0 (2023-12-07)
39

410
* (klein0r) Updated blockly logo

‎README.md

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ Since v5.5.0 of the JavaScript adapter the following locations (relative to the
4646
<!--
4747
### **WORK IN PROGRESS**
4848
-->
49-
### **WORK IN PROGRESS**
49+
### 7.6.3 (2024-01-11)
5050

5151
* (klein0r) Fixed bug in formatTimeDiff Blockly
5252

@@ -72,12 +72,6 @@ Since v5.5.0 of the JavaScript adapter the following locations (relative to the
7272
* (klein0r) Fixed layout of script type selection
7373
* (klein0r) Fixed sendto with multiple instances (for callback / timeout handling)
7474

75-
### 7.4.0 (2023-12-08)
76-
77-
* (klein0r) Download script as xml file (export)
78-
* (klein0r) Import script as file (upload)
79-
* (klein0r) Hide global folder if expert mode is disabled
80-
8175
## License
8276
The MIT License (MIT)
8377

‎admin/asset-manifest.json

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"files": {
3-
"main.js": "/static/js/main.20cfe954.js",
3+
"main.js": "/static/js/main.10262ca6.js",
44
"static/css/864.42bfc5f3.chunk.css": "/static/css/864.42bfc5f3.chunk.css",
5-
"static/js/864.0720b367.chunk.js": "/static/js/864.0720b367.chunk.js",
5+
"static/js/864.74e29d53.chunk.js": "/static/js/864.74e29d53.chunk.js",
66
"static/js/805.7c367e53.chunk.js": "/static/js/805.7c367e53.chunk.js",
77
"static/js/723.a75610c2.chunk.js": "/static/js/723.a75610c2.chunk.js",
88
"static/js/66.ebb5d6fe.chunk.js": "/static/js/66.ebb5d6fe.chunk.js",
@@ -17,23 +17,23 @@
1717
"static/js/610.1561417c.chunk.js": "/static/js/610.1561417c.chunk.js",
1818
"static/js/715.7c0e8344.chunk.js": "/static/js/715.7c0e8344.chunk.js",
1919
"static/js/880.62623dec.chunk.js": "/static/js/880.62623dec.chunk.js",
20-
"static/js/662.92ebdcc2.chunk.js": "/static/js/662.92ebdcc2.chunk.js",
20+
"static/js/662.fec2a802.chunk.js": "/static/js/662.fec2a802.chunk.js",
2121
"static/js/399.f713c6bc.chunk.js": "/static/js/399.f713c6bc.chunk.js",
2222
"static/js/238.b904fead.chunk.js": "/static/js/238.b904fead.chunk.js",
2323
"static/js/77.9fe70d7d.chunk.js": "/static/js/77.9fe70d7d.chunk.js",
2424
"static/js/85.3afe2022.chunk.js": "/static/js/85.3afe2022.chunk.js",
2525
"static/js/983.3f5b808f.chunk.js": "/static/js/983.3f5b808f.chunk.js",
2626
"static/js/888.f2162868.chunk.js": "/static/js/888.f2162868.chunk.js",
27-
"static/js/223.27df04f5.chunk.js": "/static/js/223.27df04f5.chunk.js",
27+
"static/js/223.2ce55a07.chunk.js": "/static/js/223.2ce55a07.chunk.js",
2828
"static/js/895.9237a1ad.chunk.js": "/static/js/895.9237a1ad.chunk.js",
2929
"static/js/419.daaba277.chunk.js": "/static/js/419.daaba277.chunk.js",
3030
"static/js/562.8a3aa23b.chunk.js": "/static/js/562.8a3aa23b.chunk.js",
3131
"static/js/774.a3bcb017.chunk.js": "/static/js/774.a3bcb017.chunk.js",
3232
"static/js/956.8456a0f8.chunk.js": "/static/js/956.8456a0f8.chunk.js",
3333
"static/js/377.2f585ccd.chunk.js": "/static/js/377.2f585ccd.chunk.js",
34-
"static/js/838.2787e424.chunk.js": "/static/js/838.2787e424.chunk.js",
34+
"static/js/838.b6d6870a.chunk.js": "/static/js/838.b6d6870a.chunk.js",
3535
"static/js/17.ec756001.chunk.js": "/static/js/17.ec756001.chunk.js",
36-
"static/js/917.5befffde.chunk.js": "/static/js/917.5befffde.chunk.js",
36+
"static/js/917.05d2dfa0.chunk.js": "/static/js/917.05d2dfa0.chunk.js",
3737
"static/media/tileRules.png": "/static/media/tileRules.7ed5885a66686cc288b1.png",
3838
"static/media/docs.md": "/static/media/docs.1f96bec81cf08933d921.md",
3939
"static/media/back.jpg": "/static/media/back.bda2bbe51be338a0f657.jpg",
@@ -161,9 +161,9 @@
161161
"static/media/Garage Doors.svg": "/static/media/Garage Doors.0c2a1cfca7ad1ea59625.svg",
162162
"static/media/Outdoor Blinds.svg": "/static/media/Outdoor Blinds.37b85a9c060a4af48da9.svg",
163163
"static/media/Upstairs.svg": "/static/media/Upstairs.441813e54e0daca0882d.svg",
164-
"main.20cfe954.js.map": "/static/js/main.20cfe954.js.map",
164+
"main.10262ca6.js.map": "/static/js/main.10262ca6.js.map",
165165
"864.42bfc5f3.chunk.css.map": "/static/css/864.42bfc5f3.chunk.css.map",
166-
"864.0720b367.chunk.js.map": "/static/js/864.0720b367.chunk.js.map",
166+
"864.74e29d53.chunk.js.map": "/static/js/864.74e29d53.chunk.js.map",
167167
"805.7c367e53.chunk.js.map": "/static/js/805.7c367e53.chunk.js.map",
168168
"723.a75610c2.chunk.js.map": "/static/js/723.a75610c2.chunk.js.map",
169169
"66.ebb5d6fe.chunk.js.map": "/static/js/66.ebb5d6fe.chunk.js.map",
@@ -178,25 +178,25 @@
178178
"610.1561417c.chunk.js.map": "/static/js/610.1561417c.chunk.js.map",
179179
"715.7c0e8344.chunk.js.map": "/static/js/715.7c0e8344.chunk.js.map",
180180
"880.62623dec.chunk.js.map": "/static/js/880.62623dec.chunk.js.map",
181-
"662.92ebdcc2.chunk.js.map": "/static/js/662.92ebdcc2.chunk.js.map",
181+
"662.fec2a802.chunk.js.map": "/static/js/662.fec2a802.chunk.js.map",
182182
"399.f713c6bc.chunk.js.map": "/static/js/399.f713c6bc.chunk.js.map",
183183
"238.b904fead.chunk.js.map": "/static/js/238.b904fead.chunk.js.map",
184184
"77.9fe70d7d.chunk.js.map": "/static/js/77.9fe70d7d.chunk.js.map",
185185
"85.3afe2022.chunk.js.map": "/static/js/85.3afe2022.chunk.js.map",
186186
"983.3f5b808f.chunk.js.map": "/static/js/983.3f5b808f.chunk.js.map",
187187
"888.f2162868.chunk.js.map": "/static/js/888.f2162868.chunk.js.map",
188-
"223.27df04f5.chunk.js.map": "/static/js/223.27df04f5.chunk.js.map",
188+
"223.2ce55a07.chunk.js.map": "/static/js/223.2ce55a07.chunk.js.map",
189189
"895.9237a1ad.chunk.js.map": "/static/js/895.9237a1ad.chunk.js.map",
190190
"419.daaba277.chunk.js.map": "/static/js/419.daaba277.chunk.js.map",
191191
"562.8a3aa23b.chunk.js.map": "/static/js/562.8a3aa23b.chunk.js.map",
192192
"774.a3bcb017.chunk.js.map": "/static/js/774.a3bcb017.chunk.js.map",
193193
"956.8456a0f8.chunk.js.map": "/static/js/956.8456a0f8.chunk.js.map",
194194
"377.2f585ccd.chunk.js.map": "/static/js/377.2f585ccd.chunk.js.map",
195-
"838.2787e424.chunk.js.map": "/static/js/838.2787e424.chunk.js.map",
195+
"838.b6d6870a.chunk.js.map": "/static/js/838.b6d6870a.chunk.js.map",
196196
"17.ec756001.chunk.js.map": "/static/js/17.ec756001.chunk.js.map",
197-
"917.5befffde.chunk.js.map": "/static/js/917.5befffde.chunk.js.map"
197+
"917.05d2dfa0.chunk.js.map": "/static/js/917.05d2dfa0.chunk.js.map"
198198
},
199199
"entrypoints": [
200-
"static/js/main.20cfe954.js"
200+
"static/js/main.10262ca6.js"
201201
]
202202
}

‎admin/google-blockly/own/blocks_convert.js

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -369,17 +369,9 @@ Blockly.Blocks.convert_time_difference = {
369369
Blockly.JavaScript.convert_time_difference = function (block) {
370370
const option = block.getFieldValue('OPTION');
371371
const format = block.getFieldValue('FORMAT');
372-
373372
const value = Blockly.JavaScript.valueToCode(block, 'VALUE', Blockly.JavaScript.ORDER_ATOMIC);
374373

375-
let code;
376-
if (option === 'custom') {
377-
code = `formatTimeDiff(getDateObject(${value}), '${format}')`;
378-
} else {
379-
code = `formatTimeDiff(getDateObject(${value}), '${option}')`;
380-
}
381-
382-
return [code, Blockly.JavaScript.ORDER_ATOMIC];
374+
return [`formatTimeDiff(${value}, '${option === 'custom' ? format : option}')`, Blockly.JavaScript.ORDER_ATOMIC];
383375
};
384376

385377
// --- json2object --------------------------------------------------

0 commit comments

Comments
 (0)