Skip to content

Commit

Permalink
chore: release v7.3.0
Browse files Browse the repository at this point in the history
* (klein0r) Updated blockly logo
* (klein0r) Always set variables like isDaylightSaving
* (klein0r) Added astro times as states
* (klein0r) Fixed copied time blocks
  • Loading branch information
klein0r committed Dec 7, 2023
1 parent b5ef114 commit 1fea001
Show file tree
Hide file tree
Showing 22 changed files with 48 additions and 43 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG_OLD.md
@@ -1,4 +1,7 @@
The newest change log is in README.md
## 7.1.1 (2023-06-20)
* (bluefox) corrected the script export

## 7.1.0 (2023-06-13)
* (klein0r) Added new blocks: new line, random number, value between min and max, if empty
* (klein0r) Updated blockly core to v9.3.3
Expand Down
5 changes: 1 addition & 4 deletions README.md
Expand Up @@ -46,7 +46,7 @@ Since v5.5.0 of the JavaScript adapter the following locations (relative to the
<!--
### **WORK IN PROGRESS**
-->
### **WORK IN PROGRESS**
### 7.3.0 (2023-12-07)

* (klein0r) Updated blockly logo
* (klein0r) Always set variables like isDaylightSaving
Expand Down Expand Up @@ -74,9 +74,6 @@ NodeJS 16.x is required
* (bluefox) Added version to the side menu
* (klein0r) Added blockly blocks for `getHistory` and calculated times

### 7.1.1 (2023-06-20)
* (bluefox) corrected the script export

## License
The MIT License (MIT)

Expand Down
18 changes: 11 additions & 7 deletions admin/asset-manifest.json
@@ -1,8 +1,8 @@
{
"files": {
"main.js": "/static/js/main.affc7ec6.js",
"static/css/487.9934873c.chunk.css": "/static/css/487.9934873c.chunk.css",
"static/js/487.d623930c.chunk.js": "/static/js/487.d623930c.chunk.js",
"main.js": "/static/js/main.2afaeff2.js",
"static/css/864.42bfc5f3.chunk.css": "/static/css/864.42bfc5f3.chunk.css",
"static/js/864.ca2d7da5.chunk.js": "/static/js/864.ca2d7da5.chunk.js",
"static/js/90.356ce273.chunk.js": "/static/js/90.356ce273.chunk.js",
"static/js/750.cbf4f684.chunk.js": "/static/js/750.cbf4f684.chunk.js",
"static/js/723.6006b5e8.chunk.js": "/static/js/723.6006b5e8.chunk.js",
Expand Down Expand Up @@ -30,8 +30,12 @@
"static/js/882.2c8933e3.chunk.js": "/static/js/882.2c8933e3.chunk.js",
"static/js/377.2f585ccd.chunk.js": "/static/js/377.2f585ccd.chunk.js",
"static/js/360.59624b85.chunk.js": "/static/js/360.59624b85.chunk.js",
"static/media/tileRules.png": "/static/media/tileRules.7ed5885a66686cc288b1.png",
"static/media/docs.md": "/static/media/docs.1f96bec81cf08933d921.md",
"static/media/back.jpg": "/static/media/back.bda2bbe51be338a0f657.jpg",
"static/media/tileJS.png": "/static/media/tileJS.8810e7b4835e61465c3a.png",
"static/media/tileTS.png": "/static/media/tileTS.446265dff5dc550d46a5.png",
"static/media/tileBlockly.png": "/static/media/tileBlockly.42b0a9f0e66bc4e68f4b.png",
"static/media/hysteresis.png": "/static/media/hysteresis.04ebd02c6062432f891d.png",
"index.html": "/index.html",
"static/media/Ground Floor.svg": "/static/media/Ground Floor.2b7c5c91db7f070935a2.svg",
Expand Down Expand Up @@ -153,9 +157,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.affc7ec6.js.map": "/static/js/main.affc7ec6.js.map",
"487.9934873c.chunk.css.map": "/static/css/487.9934873c.chunk.css.map",
"487.d623930c.chunk.js.map": "/static/js/487.d623930c.chunk.js.map",
"main.2afaeff2.js.map": "/static/js/main.2afaeff2.js.map",
"864.42bfc5f3.chunk.css.map": "/static/css/864.42bfc5f3.chunk.css.map",
"864.ca2d7da5.chunk.js.map": "/static/js/864.ca2d7da5.chunk.js.map",
"90.356ce273.chunk.js.map": "/static/js/90.356ce273.chunk.js.map",
"750.cbf4f684.chunk.js.map": "/static/js/750.cbf4f684.chunk.js.map",
"723.6006b5e8.chunk.js.map": "/static/js/723.6006b5e8.chunk.js.map",
Expand Down Expand Up @@ -185,6 +189,6 @@
"360.59624b85.chunk.js.map": "/static/js/360.59624b85.chunk.js.map"
},
"entrypoints": [
"static/js/main.affc7ec6.js"
"static/js/main.2afaeff2.js"
]
}
11 changes: 6 additions & 5 deletions admin/google-blockly/own/blocks_time.js
Expand Up @@ -114,19 +114,20 @@ Blockly.Blocks['time_compare_ex'] = {
this.appendDummyInput('AND')
.appendField(Blockly.Translate('time_compare_and'));

const input = this.appendValueInput('END_TIME');
this.appendValueInput('END_TIME');

if (!window.scripts.loading) {
const wp = this.workspace;

setTimeout(function () {
if (!input.connection.isConnected()) {
setTimeout(() => {
const existingInput = this.getInput('END_TIME');
if (!existingInput.connection.isConnected()) {
const shadow = wp.newBlock('text');
shadow.setShadow(true);
shadow.setFieldValue('18:00', 'TEXT');

shadow.outputConnection.connect(input.connection);
// input.connection.connect(shadow.outputConnection);
shadow.outputConnection.connect(existingInput.connection);
// existingInput.connection.connect(shadow.outputConnection);

shadow.initSvg();
shadow.render();
Expand Down
4 changes: 2 additions & 2 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.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

2 changes: 0 additions & 2 deletions admin/static/js/487.d623930c.chunk.js

This file was deleted.

1 change: 0 additions & 1 deletion admin/static/js/487.d623930c.chunk.js.map

This file was deleted.

2 changes: 2 additions & 0 deletions admin/static/js/864.ca2d7da5.chunk.js

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions admin/static/js/864.ca2d7da5.chunk.js.map

Large diffs are not rendered by default.

0 comments on commit 1fea001

Please sign in to comment.