Skip to content

Commit

Permalink
chore: release v8.5.2
Browse files Browse the repository at this point in the history
* (foxriver76) fixed issue with additional node modules when using js-controller version 6
* (klein0r) Added Blockly block to check if text includes another text
* (klein0r) Fixed onFile error when file has been deleted
  • Loading branch information
klein0r committed Jun 11, 2024
1 parent 4113cee commit 97a5cdd
Show file tree
Hide file tree
Showing 20 changed files with 97 additions and 39 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG_OLD.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
The newest change log is in README.md
## 8.4.1 (2024-05-26)

* (klein0r) Fixed httpPost block
* (klein0r) Just raise deprecated warnings once per script start/usage

## 8.4.0 (2024-05-25)

* (klein0r) Added checks/warnings for more incorrect blockly connections
Expand Down
7 changes: 1 addition & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ Executes Javascript, Typescript Scripts.
<!--
### **WORK IN PROGRESS**
-->
### **WORK IN PROGRESS**
### 8.5.2 (2024-06-11)

* (foxriver76) fixed issue with additional node modules when using js-controller version 6
* (klein0r) Added Blockly block to check if text includes another text
Expand Down Expand Up @@ -54,11 +54,6 @@ Executes Javascript, Typescript Scripts.
* (klein0r) Fixed createState (removed redundant native attributes)
* (winnyschuster) Fixed astro custom component

### 8.4.1 (2024-05-26)

* (klein0r) Fixed httpPost block
* (klein0r) Just raise deprecated warnings once per script start/usage

## License
The MIT License (MIT)

Expand Down
10 changes: 5 additions & 5 deletions admin/asset-manifest.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"files": {
"main.js": "/static/js/main.720010c8.js",
"main.js": "/static/js/main.4abd3a67.js",
"static/css/373.d5afd7f9.chunk.css": "/static/css/373.d5afd7f9.chunk.css",
"static/js/373.50668df1.chunk.js": "/static/js/373.50668df1.chunk.js",
"static/js/373.b60b15e4.chunk.js": "/static/js/373.b60b15e4.chunk.js",
"static/js/498.660757a3.chunk.js": "/static/js/498.660757a3.chunk.js",
"static/js/30.0d37e3aa.chunk.js": "/static/js/30.0d37e3aa.chunk.js",
"static/js/704.6e463396.chunk.js": "/static/js/704.6e463396.chunk.js",
Expand Down Expand Up @@ -160,9 +160,9 @@
"static/media/Garage Doors.svg": "/static/media/Garage Doors.0c2a1cfca7ad1ea59625.svg",
"static/media/Outdoor Blinds.svg": "/static/media/Outdoor Blinds.37b85a9c060a4af48da9.svg",
"static/media/Upstairs.svg": "/static/media/Upstairs.441813e54e0daca0882d.svg",
"main.720010c8.js.map": "/static/js/main.720010c8.js.map",
"main.4abd3a67.js.map": "/static/js/main.4abd3a67.js.map",
"373.d5afd7f9.chunk.css.map": "/static/css/373.d5afd7f9.chunk.css.map",
"373.50668df1.chunk.js.map": "/static/js/373.50668df1.chunk.js.map",
"373.b60b15e4.chunk.js.map": "/static/js/373.b60b15e4.chunk.js.map",
"498.660757a3.chunk.js.map": "/static/js/498.660757a3.chunk.js.map",
"30.0d37e3aa.chunk.js.map": "/static/js/30.0d37e3aa.chunk.js.map",
"704.6e463396.chunk.js.map": "/static/js/704.6e463396.chunk.js.map",
Expand Down Expand Up @@ -193,6 +193,6 @@
"93.74b3fa7f.chunk.js.map": "/static/js/93.74b3fa7f.chunk.js.map"
},
"entrypoints": [
"static/js/main.720010c8.js"
"static/js/main.4abd3a67.js"
]
}
2 changes: 1 addition & 1 deletion admin/custom/customComponents.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion admin/custom/customComponents.js.map

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Binary file modified admin/google-blockly/blockly-10.4.3.tgz
Binary file not shown.
19 changes: 15 additions & 4 deletions admin/google-blockly/own/blocks_system.js
Original file line number Diff line number Diff line change
Expand Up @@ -620,13 +620,19 @@ Blockly.Blocks['create'] = {
.appendField(Blockly.Translate('create_oid'))
.appendField(new Blockly.FieldTextInput('0_userdata.0.example'), 'NAME');

this.appendValueInput('VALUE')
const inputValue = this.appendValueInput('VALUE')
.setCheck(null)
.appendField(Blockly.Translate('create_init'));
if (inputValue.connection) {
inputValue.connection._optional = true;
}

this.appendValueInput('COMMON')
const inputCommon = this.appendValueInput('COMMON')
.setCheck(null)
.appendField(Blockly.Translate('create_common'));
if (inputCommon.connection) {
inputCommon.connection._optional = true;
}

this.appendStatementInput('STATEMENT')
.setCheck(null);
Expand Down Expand Up @@ -692,9 +698,12 @@ Blockly.Blocks['create_ex'] = {
[Blockly.Translate('create_type_array'), 'array'],
]), 'TYPE');

this.appendValueInput('VALUE')
const inputValue = this.appendValueInput('VALUE')
.setCheck(null)
.appendField(Blockly.Translate('create_init'));
if (inputValue.connection) {
inputValue.connection._optional = true;
}

this.appendDummyInput('READABLE_INPUT')
.appendField(Blockly.Translate('create_readable'))
Expand Down Expand Up @@ -730,8 +739,10 @@ Blockly.JavaScript.forBlock['create_ex'] = function (block) {
paraV = `, parseFloat(${value})`;
} else if (type === 'boolean') {
paraV = `, !!${value}`;
} else if (type === 'string') {
paraV = `, String(${value})`;
} else {
paraV = ', ' + value;
paraV = `, ${value}`;
}
}

Expand Down
36 changes: 35 additions & 1 deletion admin/google-blockly/own/blocks_text.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,12 @@ Blockly.Blocks['text_newline'] = {
.appendField(Blockly.Translate('text_newline'));

this.appendDummyInput()
.appendField(new Blockly.FieldDropdown([['\\n', '\\n'], ['\\r\\n', '\\r\\n'], ['\\r', '\\r']]), 'Type');
.appendField(new Blockly.FieldDropdown([
['\\n', '\\n'],
['\\r', '\\r'],
['\\r\\n', '\\r\\n'],
]), 'Type');

this.setInputsInline(true);
this.setColour('%{BKY_TEXTS_HUE}');
this.setOutput(true, 'String');
Expand All @@ -21,3 +26,32 @@ Blockly.JavaScript.forBlock['text_newline'] = function (block) {
const dropdownType = block.getFieldValue('Type');
return [`'${dropdownType}'`, Blockly.JavaScript.ORDER_ATOMIC];
};

// --- Text contains --------------------------------------------------

Blockly.Blocks['text_contains'] = {
// Checkbox.
init: function () {
this.appendDummyInput()
.appendField(Blockly.Translate('text_contains'));

this.appendValueInput('VALUE')
.setCheck(null);

this.appendValueInput('FIND')
.setCheck(null)
.appendField(Blockly.Translate('text_contains_value'));

this.setInputsInline(true);
this.setColour('%{BKY_TEXTS_HUE}');
this.setOutput(true, 'Boolean');
//this.setTooltip(Blockly.Translate('text_contains_tooltip'));
},
};

Blockly.JavaScript.forBlock['text_contains'] = function (block) {
const value = Blockly.JavaScript.valueToCode(block, 'VALUE', Blockly.JavaScript.ORDER_ATOMIC);
const find = Blockly.JavaScript.valueToCode(block, 'FIND', Blockly.JavaScript.ORDER_ATOMIC);

return [`String(${value}).includes(${find})`, Blockly.JavaScript.ORDER_ATOMIC];
};
7 changes: 7 additions & 0 deletions admin/google-blockly/own/blocks_words.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions admin/static/js/373.b60b15e4.chunk.js

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions admin/static/js/373.b60b15e4.chunk.js.map

Large diffs are not rendered by default.

Loading

0 comments on commit 97a5cdd

Please sign in to comment.