Skip to content

Commit bd8624f

Browse files
klein0rklein0r
committed
chore: release v7.2.0
NodeJS 16.x is required * (klein0r) Added function to format time difference `formatTimeDiff` * (klein0r) Added blockly blocks for `formatTimeDiff` * (klein0r) messageToAsync was not working without options * (klein0r) Added timeout and custom options for sendToAsync * (klein0r) Fixed valid switch statement expressions * (klein0r) Added text replacement, cound and reverse blocks * (klein0r) Added list reverse block
1 parent 165c265 commit bd8624f

File tree

156 files changed

+331
-345
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

156 files changed

+331
-345
lines changed

‎CHANGELOG_OLD.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
The newest change log is in README.md
2+
## 7.1.0 (2023-06-13)
3+
* (klein0r) Added new blocks: new line, random number, value between min and max, if empty
4+
* (klein0r) Updated blockly core to v9.3.3
5+
* (bluefox) corrected blockly
6+
27
## 7.0.8 (2023-06-12)
38
* (klein0r) Corrected trigger block
49
* (klein0r) Corrected typescript V5

‎README.md

Lines changed: 1 addition & 6 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.2.0 (2023-12-04)
5050
NodeJS 16.x is required
5151

5252
* (klein0r) Added function to format time difference `formatTimeDiff`
@@ -70,11 +70,6 @@ NodeJS 16.x is required
7070
### 7.1.1 (2023-06-20)
7171
* (bluefox) corrected the script export
7272

73-
### 7.1.0 (2023-06-13)
74-
* (klein0r) Added new blocks: new line, random number, value between min and max, if empty
75-
* (klein0r) Updated blockly core to v9.3.3
76-
* (bluefox) corrected blockly
77-
7873
## License
7974
The MIT License (MIT)
8075

‎admin/asset-manifest.json

Lines changed: 62 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,41 @@
11
{
22
"files": {
3-
"main.js": "/static/js/main.5835fe2e.js",
4-
"static/css/487.c44034b2.chunk.css": "/static/css/487.c44034b2.chunk.css",
5-
"static/js/487.cdbad626.chunk.js": "/static/js/487.cdbad626.chunk.js",
6-
"static/js/90.30165444.chunk.js": "/static/js/90.30165444.chunk.js",
7-
"static/js/184.c77b5f58.chunk.js": "/static/js/184.c77b5f58.chunk.js",
8-
"static/js/536.cd22fe6f.chunk.js": "/static/js/536.cd22fe6f.chunk.js",
9-
"static/js/711.cca79cc5.chunk.js": "/static/js/711.cca79cc5.chunk.js",
10-
"static/js/273.7ab1b85a.chunk.js": "/static/js/273.7ab1b85a.chunk.js",
11-
"static/js/281.6af18b40.chunk.js": "/static/js/281.6af18b40.chunk.js",
12-
"static/js/7.647eff54.chunk.js": "/static/js/7.647eff54.chunk.js",
13-
"static/js/666.a71c4c86.chunk.js": "/static/js/666.a71c4c86.chunk.js",
14-
"static/js/791.58c8138c.chunk.js": "/static/js/791.58c8138c.chunk.js",
15-
"static/js/164.d2d05c2a.chunk.js": "/static/js/164.d2d05c2a.chunk.js",
16-
"static/js/365.44786227.chunk.js": "/static/js/365.44786227.chunk.js",
17-
"static/js/147.2004630a.chunk.js": "/static/js/147.2004630a.chunk.js",
18-
"static/js/599.9f12dcda.chunk.js": "/static/js/599.9f12dcda.chunk.js",
19-
"static/js/691.26ff76ce.chunk.js": "/static/js/691.26ff76ce.chunk.js",
20-
"static/js/715.f66d4e9f.chunk.js": "/static/js/715.f66d4e9f.chunk.js",
21-
"static/js/815.5bc63a3b.chunk.js": "/static/js/815.5bc63a3b.chunk.js",
22-
"static/js/580.07d2b943.chunk.js": "/static/js/580.07d2b943.chunk.js",
23-
"static/js/227.d7fff110.chunk.js": "/static/js/227.d7fff110.chunk.js",
24-
"static/js/712.f17de40c.chunk.js": "/static/js/712.f17de40c.chunk.js",
25-
"static/js/859.ab41b4f5.chunk.js": "/static/js/859.ab41b4f5.chunk.js",
26-
"static/js/149.2197f5fc.chunk.js": "/static/js/149.2197f5fc.chunk.js",
27-
"static/js/304.efa6f664.chunk.js": "/static/js/304.efa6f664.chunk.js",
28-
"static/js/677.69ec119b.chunk.js": "/static/js/677.69ec119b.chunk.js",
29-
"static/js/419.6bdb5b75.chunk.js": "/static/js/419.6bdb5b75.chunk.js",
30-
"static/js/378.3b49e7cd.chunk.js": "/static/js/378.3b49e7cd.chunk.js",
31-
"static/js/223.880cd611.chunk.js": "/static/js/223.880cd611.chunk.js",
32-
"static/js/610.d3cce782.chunk.js": "/static/js/610.d3cce782.chunk.js",
33-
"static/js/838.25b28a1b.chunk.js": "/static/js/838.25b28a1b.chunk.js",
34-
"static/js/826.0315df68.chunk.js": "/static/js/826.0315df68.chunk.js",
35-
"static/js/448.85be54c4.chunk.js": "/static/js/448.85be54c4.chunk.js",
36-
"static/js/377.b42dcc2d.chunk.js": "/static/js/377.b42dcc2d.chunk.js",
37-
"static/js/500.52414135.chunk.js": "/static/js/500.52414135.chunk.js",
3+
"main.js": "/static/js/main.affc7ec6.js",
4+
"static/css/487.9934873c.chunk.css": "/static/css/487.9934873c.chunk.css",
5+
"static/js/487.d623930c.chunk.js": "/static/js/487.d623930c.chunk.js",
6+
"static/js/90.356ce273.chunk.js": "/static/js/90.356ce273.chunk.js",
7+
"static/js/750.cbf4f684.chunk.js": "/static/js/750.cbf4f684.chunk.js",
8+
"static/js/723.6006b5e8.chunk.js": "/static/js/723.6006b5e8.chunk.js",
9+
"static/js/66.d1abe60e.chunk.js": "/static/js/66.d1abe60e.chunk.js",
10+
"static/js/281.fe2096fc.chunk.js": "/static/js/281.fe2096fc.chunk.js",
11+
"static/js/7.1d9b7afb.chunk.js": "/static/js/7.1d9b7afb.chunk.js",
12+
"static/js/791.258dd609.chunk.js": "/static/js/791.258dd609.chunk.js",
13+
"static/js/164.2c2b1075.chunk.js": "/static/js/164.2c2b1075.chunk.js",
14+
"static/js/365.ca66a412.chunk.js": "/static/js/365.ca66a412.chunk.js",
15+
"static/js/531.eceebccc.chunk.js": "/static/js/531.eceebccc.chunk.js",
16+
"static/js/610.387670d8.chunk.js": "/static/js/610.387670d8.chunk.js",
17+
"static/js/715.e43e7502.chunk.js": "/static/js/715.e43e7502.chunk.js",
18+
"static/js/815.a724f988.chunk.js": "/static/js/815.a724f988.chunk.js",
19+
"static/js/593.ce4678ac.chunk.js": "/static/js/593.ce4678ac.chunk.js",
20+
"static/js/238.c2010836.chunk.js": "/static/js/238.c2010836.chunk.js",
21+
"static/js/653.16a4ceb0.chunk.js": "/static/js/653.16a4ceb0.chunk.js",
22+
"static/js/801.692f530f.chunk.js": "/static/js/801.692f530f.chunk.js",
23+
"static/js/983.6d21e150.chunk.js": "/static/js/983.6d21e150.chunk.js",
24+
"static/js/223.9d200641.chunk.js": "/static/js/223.9d200641.chunk.js",
25+
"static/js/677.2b2e7051.chunk.js": "/static/js/677.2b2e7051.chunk.js",
26+
"static/js/419.e33ac3f8.chunk.js": "/static/js/419.e33ac3f8.chunk.js",
27+
"static/js/790.5b04e18a.chunk.js": "/static/js/790.5b04e18a.chunk.js",
28+
"static/js/838.e7f4b756.chunk.js": "/static/js/838.e7f4b756.chunk.js",
29+
"static/js/694.cc9747de.chunk.js": "/static/js/694.cc9747de.chunk.js",
30+
"static/js/882.2c8933e3.chunk.js": "/static/js/882.2c8933e3.chunk.js",
31+
"static/js/377.2f585ccd.chunk.js": "/static/js/377.2f585ccd.chunk.js",
32+
"static/js/360.59624b85.chunk.js": "/static/js/360.59624b85.chunk.js",
3833
"static/media/docs.md": "/static/media/docs.1f96bec81cf08933d921.md",
3934
"static/media/back.jpg": "/static/media/back.bda2bbe51be338a0f657.jpg",
4035
"static/media/hysteresis.png": "/static/media/hysteresis.04ebd02c6062432f891d.png",
36+
"index.html": "/index.html",
4137
"static/media/Ground Floor.svg": "/static/media/Ground Floor.2b7c5c91db7f070935a2.svg",
4238
"static/media/Second Floor.svg": "/static/media/Second Floor.a2d5ed32df336591c06b.svg",
43-
"index.html": "/index.html",
4439
"static/media/Cellar.svg": "/static/media/Cellar.7ec1b1803a2437c8b78c.svg",
4540
"static/media/Anteroom.svg": "/static/media/Anteroom.93a742135f2c060ad619.svg",
4641
"static/media/Corridor.svg": "/static/media/Corridor.93a742135f2c060ad619.svg",
@@ -158,43 +153,38 @@
158153
"static/media/Garage Doors.svg": "/static/media/Garage Doors.0c2a1cfca7ad1ea59625.svg",
159154
"static/media/Outdoor Blinds.svg": "/static/media/Outdoor Blinds.37b85a9c060a4af48da9.svg",
160155
"static/media/Upstairs.svg": "/static/media/Upstairs.441813e54e0daca0882d.svg",
161-
"main.5835fe2e.js.map": "/static/js/main.5835fe2e.js.map",
162-
"487.c44034b2.chunk.css.map": "/static/css/487.c44034b2.chunk.css.map",
163-
"487.cdbad626.chunk.js.map": "/static/js/487.cdbad626.chunk.js.map",
164-
"90.30165444.chunk.js.map": "/static/js/90.30165444.chunk.js.map",
165-
"184.c77b5f58.chunk.js.map": "/static/js/184.c77b5f58.chunk.js.map",
166-
"536.cd22fe6f.chunk.js.map": "/static/js/536.cd22fe6f.chunk.js.map",
167-
"711.cca79cc5.chunk.js.map": "/static/js/711.cca79cc5.chunk.js.map",
168-
"273.7ab1b85a.chunk.js.map": "/static/js/273.7ab1b85a.chunk.js.map",
169-
"281.6af18b40.chunk.js.map": "/static/js/281.6af18b40.chunk.js.map",
170-
"7.647eff54.chunk.js.map": "/static/js/7.647eff54.chunk.js.map",
171-
"666.a71c4c86.chunk.js.map": "/static/js/666.a71c4c86.chunk.js.map",
172-
"791.58c8138c.chunk.js.map": "/static/js/791.58c8138c.chunk.js.map",
173-
"164.d2d05c2a.chunk.js.map": "/static/js/164.d2d05c2a.chunk.js.map",
174-
"365.44786227.chunk.js.map": "/static/js/365.44786227.chunk.js.map",
175-
"147.2004630a.chunk.js.map": "/static/js/147.2004630a.chunk.js.map",
176-
"599.9f12dcda.chunk.js.map": "/static/js/599.9f12dcda.chunk.js.map",
177-
"691.26ff76ce.chunk.js.map": "/static/js/691.26ff76ce.chunk.js.map",
178-
"715.f66d4e9f.chunk.js.map": "/static/js/715.f66d4e9f.chunk.js.map",
179-
"815.5bc63a3b.chunk.js.map": "/static/js/815.5bc63a3b.chunk.js.map",
180-
"580.07d2b943.chunk.js.map": "/static/js/580.07d2b943.chunk.js.map",
181-
"227.d7fff110.chunk.js.map": "/static/js/227.d7fff110.chunk.js.map",
182-
"712.f17de40c.chunk.js.map": "/static/js/712.f17de40c.chunk.js.map",
183-
"859.ab41b4f5.chunk.js.map": "/static/js/859.ab41b4f5.chunk.js.map",
184-
"149.2197f5fc.chunk.js.map": "/static/js/149.2197f5fc.chunk.js.map",
185-
"304.efa6f664.chunk.js.map": "/static/js/304.efa6f664.chunk.js.map",
186-
"677.69ec119b.chunk.js.map": "/static/js/677.69ec119b.chunk.js.map",
187-
"419.6bdb5b75.chunk.js.map": "/static/js/419.6bdb5b75.chunk.js.map",
188-
"378.3b49e7cd.chunk.js.map": "/static/js/378.3b49e7cd.chunk.js.map",
189-
"223.880cd611.chunk.js.map": "/static/js/223.880cd611.chunk.js.map",
190-
"610.d3cce782.chunk.js.map": "/static/js/610.d3cce782.chunk.js.map",
191-
"838.25b28a1b.chunk.js.map": "/static/js/838.25b28a1b.chunk.js.map",
192-
"826.0315df68.chunk.js.map": "/static/js/826.0315df68.chunk.js.map",
193-
"448.85be54c4.chunk.js.map": "/static/js/448.85be54c4.chunk.js.map",
194-
"377.b42dcc2d.chunk.js.map": "/static/js/377.b42dcc2d.chunk.js.map",
195-
"500.52414135.chunk.js.map": "/static/js/500.52414135.chunk.js.map"
156+
"main.affc7ec6.js.map": "/static/js/main.affc7ec6.js.map",
157+
"487.9934873c.chunk.css.map": "/static/css/487.9934873c.chunk.css.map",
158+
"487.d623930c.chunk.js.map": "/static/js/487.d623930c.chunk.js.map",
159+
"90.356ce273.chunk.js.map": "/static/js/90.356ce273.chunk.js.map",
160+
"750.cbf4f684.chunk.js.map": "/static/js/750.cbf4f684.chunk.js.map",
161+
"723.6006b5e8.chunk.js.map": "/static/js/723.6006b5e8.chunk.js.map",
162+
"66.d1abe60e.chunk.js.map": "/static/js/66.d1abe60e.chunk.js.map",
163+
"281.fe2096fc.chunk.js.map": "/static/js/281.fe2096fc.chunk.js.map",
164+
"7.1d9b7afb.chunk.js.map": "/static/js/7.1d9b7afb.chunk.js.map",
165+
"791.258dd609.chunk.js.map": "/static/js/791.258dd609.chunk.js.map",
166+
"164.2c2b1075.chunk.js.map": "/static/js/164.2c2b1075.chunk.js.map",
167+
"365.ca66a412.chunk.js.map": "/static/js/365.ca66a412.chunk.js.map",
168+
"531.eceebccc.chunk.js.map": "/static/js/531.eceebccc.chunk.js.map",
169+
"610.387670d8.chunk.js.map": "/static/js/610.387670d8.chunk.js.map",
170+
"715.e43e7502.chunk.js.map": "/static/js/715.e43e7502.chunk.js.map",
171+
"815.a724f988.chunk.js.map": "/static/js/815.a724f988.chunk.js.map",
172+
"593.ce4678ac.chunk.js.map": "/static/js/593.ce4678ac.chunk.js.map",
173+
"238.c2010836.chunk.js.map": "/static/js/238.c2010836.chunk.js.map",
174+
"653.16a4ceb0.chunk.js.map": "/static/js/653.16a4ceb0.chunk.js.map",
175+
"801.692f530f.chunk.js.map": "/static/js/801.692f530f.chunk.js.map",
176+
"983.6d21e150.chunk.js.map": "/static/js/983.6d21e150.chunk.js.map",
177+
"223.9d200641.chunk.js.map": "/static/js/223.9d200641.chunk.js.map",
178+
"677.2b2e7051.chunk.js.map": "/static/js/677.2b2e7051.chunk.js.map",
179+
"419.e33ac3f8.chunk.js.map": "/static/js/419.e33ac3f8.chunk.js.map",
180+
"790.5b04e18a.chunk.js.map": "/static/js/790.5b04e18a.chunk.js.map",
181+
"838.e7f4b756.chunk.js.map": "/static/js/838.e7f4b756.chunk.js.map",
182+
"694.cc9747de.chunk.js.map": "/static/js/694.cc9747de.chunk.js.map",
183+
"882.2c8933e3.chunk.js.map": "/static/js/882.2c8933e3.chunk.js.map",
184+
"377.2f585ccd.chunk.js.map": "/static/js/377.2f585ccd.chunk.js.map",
185+
"360.59624b85.chunk.js.map": "/static/js/360.59624b85.chunk.js.map"
196186
},
197187
"entrypoints": [
198-
"static/js/main.5835fe2e.js"
188+
"static/js/main.affc7ec6.js"
199189
]
200190
}

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

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -299,6 +299,86 @@ Blockly.JavaScript.convert_from_date = function (block) {
299299
return [code, Blockly.JavaScript.ORDER_ATOMIC];
300300
};
301301

302+
// --- time difference --------------------------------------------------
303+
Blockly.Convert.blocks['convert_time_difference'] =
304+
'<block type="convert_time_difference">'
305+
+ ' <value name="VALUE">'
306+
+ ' </value>'
307+
+ ' <value name="OPTION">'
308+
+ ' </value>'
309+
+ ' <mutation format="false"></mutation>'
310+
+ ' <value name="FORMAT">'
311+
+ ' </value>'
312+
+ '</block>';
313+
314+
Blockly.Blocks.convert_time_difference = {
315+
init: function () {
316+
this.setColour(Blockly.Convert.HUE);
317+
this.appendValueInput('VALUE')
318+
.appendField(Blockly.Translate('convert_time_difference'));
319+
320+
this.appendDummyInput('OPTION')
321+
.appendField(Blockly.Translate('convert_to'))
322+
.appendField(new Blockly.FieldDropdown([
323+
[Blockly.Translate('time_difference_hh:mm:ss') , 'hh:mm:ss'],
324+
[Blockly.Translate('time_difference_h:m:s') , 'h:m:s'],
325+
[Blockly.Translate('time_difference_hh:mm') , 'hh:mm'],
326+
[Blockly.Translate('time_difference_h:m') , 'h:m'],
327+
[Blockly.Translate('time_difference_mm:ss') , 'mm:ss'],
328+
[Blockly.Translate('time_difference_m:s') , 'm:s'],
329+
[Blockly.Translate('time_difference_custom') , 'custom'],
330+
], function (option) {
331+
this.sourceBlock_.updateShape_(option === 'custom');
332+
}), 'OPTION');
333+
334+
this.setInputsInline(true);
335+
this.setOutput(true);
336+
this.setTooltip(Blockly.Translate('convert_time_difference_tooltip'))
337+
},
338+
mutationToDom: function() {
339+
const container = document.createElement('mutation');
340+
const option = this.getFieldValue('OPTION');
341+
342+
container.setAttribute('format', option === 'custom' ? 'true' : 'false');
343+
344+
return container;
345+
},
346+
domToMutation: function(xmlElement) {
347+
const format = xmlElement.getAttribute('format');
348+
349+
this.updateShape_(format === true || format === 'true' || format === 'TRUE');
350+
},
351+
updateShape_: function(isFormat, isLanguage) {
352+
let inputExists = this.getInput('FORMAT');
353+
354+
if (isFormat) {
355+
if (!inputExists) {
356+
this.appendDummyInput('FORMAT')
357+
.appendField(' ')
358+
.appendField(new Blockly.FieldTextInput(Blockly.Translate('time_difference_default_format')), 'FORMAT');
359+
}
360+
} else if (inputExists) {
361+
this.removeInput('FORMAT');
362+
}
363+
}
364+
};
365+
366+
Blockly.JavaScript.convert_time_difference = function (block) {
367+
const option = block.getFieldValue('OPTION');
368+
const format = block.getFieldValue('FORMAT');
369+
370+
const value = Blockly.JavaScript.valueToCode(block, 'VALUE', Blockly.JavaScript.ORDER_ATOMIC);
371+
372+
let code;
373+
if (option === 'custom') {
374+
code = `formatTimeDiff(getDateObject(${value}), '${format}')`;
375+
} else {
376+
code = `formatTimeDiff(getDateObject(${value}), '${option}')`;
377+
}
378+
379+
return [code, Blockly.JavaScript.ORDER_ATOMIC];
380+
};
381+
302382
// --- json2object --------------------------------------------------
303383
Blockly.Convert.blocks['convert_json2object'] =
304384
'<block type="convert_json2object">'

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -195,8 +195,8 @@ Blockly.JavaScript['logic_switch_case'] = function (block) {
195195
let case_n;
196196
const switchVariable = Blockly.JavaScript.valueToCode(block, 'CONDITION', Blockly.JavaScript.ORDER_NONE) || null;
197197

198-
if (switchVariable){
199-
const pattern = /^\(?([._$\d\w"?: \(\)])*\)?$/g;
198+
if (switchVariable) {
199+
const pattern = /^\(?([._$\d\w"'?: \(\)])*\)?$/g;
200200

201201
if (pattern.test(switchVariable)) { // Check to see if the switch is a kind of variable type
202202
code = '\nswitch (' + switchVariable + ') {\n';
@@ -224,5 +224,6 @@ Blockly.JavaScript['logic_switch_case'] = function (block) {
224224
alert('logic_switch_case: ' + switchVariable + ' is not a variable name');
225225
}
226226
}
227+
227228
return code;
228229
};

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@ Blockly.Blocks['text_newline'] = {
1818
};
1919

2020
Blockly.JavaScript['text_newline'] = function(block) {
21-
const dropdown_type = block.getFieldValue('Type');
22-
return ['\'' + dropdown_type + '\'', Blockly.JavaScript.ORDER_ATOMIC];
21+
const dropdownType = block.getFieldValue('Type');
22+
return [`'${dropdownType}'`, Blockly.JavaScript.ORDER_ATOMIC];
2323
};

0 commit comments

Comments
 (0)