Skip to content

Commit

Permalink
chore: release v8.4.1
Browse files Browse the repository at this point in the history
* (klein0r) Fixed httpPost block
* (klein0r) Just raise deprecated warnings once per script start/usage
  • Loading branch information
klein0r committed May 26, 2024
1 parent 3f8e61e commit baef1c7
Show file tree
Hide file tree
Showing 15 changed files with 41 additions and 36 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG_OLD.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
The newest change log is in README.md
## 8.1.1 (2024-05-03)

* (klein0r) Updated Blockly/JS and Rules/JS image (as svg)

## 8.1.0 (2024-05-03)

* (bluefox) Updated admin config to jsonConfig (dropped materialize)
Expand Down
6 changes: 1 addition & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ Since v5.5.0 of the JavaScript adapter the following locations (relative to the
<!--
### **WORK IN PROGRESS**
-->
### **WORK IN PROGRESS**
### 8.4.1 (2024-05-26)

* (klein0r) Fixed httpPost block
* (klein0r) Just raise deprecated warnings once per script start/usage
Expand Down Expand Up @@ -73,10 +73,6 @@ Since v5.5.0 of the JavaScript adapter the following locations (relative to the
* (PeterVoronov) Added toArray to result object of $-selector
* (klein0r) Added Blockly block for onLog

### 8.1.1 (2024-05-03)

* (klein0r) Updated Blockly/JS and Rules/JS image (as svg)

## 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.a8f609be.js",
"main.js": "/static/js/main.14275e1f.js",
"static/css/373.d5afd7f9.chunk.css": "/static/css/373.d5afd7f9.chunk.css",
"static/js/373.f2ba4c7d.chunk.js": "/static/js/373.f2ba4c7d.chunk.js",
"static/js/373.df064f03.chunk.js": "/static/js/373.df064f03.chunk.js",
"static/js/966.55cf00c0.chunk.js": "/static/js/966.55cf00c0.chunk.js",
"static/js/30.fbeb7a43.chunk.js": "/static/js/30.fbeb7a43.chunk.js",
"static/js/704.e698fa57.chunk.js": "/static/js/704.e698fa57.chunk.js",
Expand Down Expand Up @@ -162,9 +162,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.a8f609be.js.map": "/static/js/main.a8f609be.js.map",
"main.14275e1f.js.map": "/static/js/main.14275e1f.js.map",
"373.d5afd7f9.chunk.css.map": "/static/css/373.d5afd7f9.chunk.css.map",
"373.f2ba4c7d.chunk.js.map": "/static/js/373.f2ba4c7d.chunk.js.map",
"373.df064f03.chunk.js.map": "/static/js/373.df064f03.chunk.js.map",
"966.55cf00c0.chunk.js.map": "/static/js/966.55cf00c0.chunk.js.map",
"30.fbeb7a43.chunk.js.map": "/static/js/30.fbeb7a43.chunk.js.map",
"704.e698fa57.chunk.js.map": "/static/js/704.e698fa57.chunk.js.map",
Expand Down Expand Up @@ -197,6 +197,6 @@
"456.b3a51d3c.chunk.js.map": "/static/js/456.b3a51d3c.chunk.js.map"
},
"entrypoints": [
"static/js/main.a8f609be.js"
"static/js/main.14275e1f.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.

11 changes: 5 additions & 6 deletions admin/google-blockly/own/blocks_action.js
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ Blockly.Blocks['http_get'] = {
.appendField(new Blockly.FieldTextInput(2000), 'TIMEOUT')
.appendField(new Blockly.FieldDropdown([
[Blockly.Translate('http_timeout_ms'), 'ms'],
[Blockly.Translate('http_timeout_sec'), 'sec']
[Blockly.Translate('http_timeout_sec'), 'sec'],
]), 'UNIT');

this.appendDummyInput('TYPE')
Expand Down Expand Up @@ -272,7 +272,7 @@ Blockly.Action.blocks['http_post'] =
+ ' <value name="TYPE">'
+ ' </value>'
+ ' <value name="DATA">'
+ ' <shadow type="object_new">'
+ ' <shadow type="logic_null">'
+ ' </shadow>'
+ ' </value>'
+ ' <value name="STATEMENT">'
Expand All @@ -289,7 +289,7 @@ Blockly.Blocks['http_post'] = {
.appendField(new Blockly.FieldTextInput(2000), 'TIMEOUT')
.appendField(new Blockly.FieldDropdown([
[Blockly.Translate('http_timeout_ms'), 'ms'],
[Blockly.Translate('http_timeout_sec'), 'sec']
[Blockly.Translate('http_timeout_sec'), 'sec'],
]), 'UNIT');

this.appendDummyInput('TYPE')
Expand Down Expand Up @@ -317,9 +317,9 @@ Blockly.Blocks['http_post'] = {

Blockly.JavaScript['http_post'] = function(block) {
const URL = Blockly.JavaScript.valueToCode(block, 'URL', Blockly.JavaScript.ORDER_ATOMIC);
const data = Blockly.JavaScript.valueToCode(block, 'DATA', Blockly.JavaScript.ORDER_ATOMIC);
const statement = Blockly.JavaScript.statementToCode(block, 'STATEMENT');
const unit = block.getFieldValue('UNIT');

let timeout = block.getFieldValue('TIMEOUT');
if (isNaN(timeout)) {
timeout = 2000;
Expand All @@ -333,6 +333,7 @@ Blockly.JavaScript['http_post'] = function(block) {
responseType = 'text';
}

let data = Blockly.JavaScript.valueToCode(block, 'DATA', Blockly.JavaScript.ORDER_ATOMIC);
if (!data) {
data = 'null';
}
Expand Down Expand Up @@ -686,8 +687,6 @@ Blockly.JavaScript['request'] = function(block) {
logText = '';
}

logText += `console.warn('request blockly block is deprecated - please use "http (GET)" instead');\n`;

if (withStatement === 'TRUE' || withStatement === 'true' || withStatement === true) {
const statement = Blockly.JavaScript.statementToCode(block, 'STATEMENT');
if (statement) {
Expand Down
2 changes: 2 additions & 0 deletions admin/static/js/373.df064f03.chunk.js

Large diffs are not rendered by default.

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

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions admin/static/js/main.14275e1f.js

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

1 change: 1 addition & 0 deletions admin/static/js/main.14275e1f.js.map

Large diffs are not rendered by default.

Loading

0 comments on commit baef1c7

Please sign in to comment.