Skip to content

Commit

Permalink
chore: release v7.10.1
Browse files Browse the repository at this point in the history
* (klein0r) Fixed cron trigger
  • Loading branch information
klein0r committed Mar 22, 2024
1 parent 21234d4 commit a3b5ff6
Show file tree
Hide file tree
Showing 13 changed files with 45 additions and 37 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG_OLD.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
The newest change log is in README.md
## 7.9.1 (2024-03-15)

* (klein0r) Configurable trigger warning limit (default: 100 per script)
* (klein0r) Allow to use objects in create state blocks for common
* (klein0r) Added warning if latitude or longitude is not configured correctly

## 7.9.0 (2024-03-13)

* (klein0r) Added block to create new objects
Expand Down
8 changes: 1 addition & 7 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**
### 7.10.1 (2024-03-22)

* (klein0r) Fixed cron trigger

Expand All @@ -66,12 +66,6 @@ Since v5.5.0 of the JavaScript adapter the following locations (relative to the

* (klein0r) Added new block for http response

### 7.9.1 (2024-03-15)

* (klein0r) Configurable trigger warning limit (default: 100 per script)
* (klein0r) Allow to use objects in create state blocks for common
* (klein0r) Added warning if latitude or longitude is not configured correctly

## 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.375f3683.js",
"main.js": "/static/js/main.855cf2dc.js",
"static/css/864.42bfc5f3.chunk.css": "/static/css/864.42bfc5f3.chunk.css",
"static/js/864.c97a284b.chunk.js": "/static/js/864.c97a284b.chunk.js",
"static/js/864.87464ec4.chunk.js": "/static/js/864.87464ec4.chunk.js",
"static/js/805.7c367e53.chunk.js": "/static/js/805.7c367e53.chunk.js",
"static/js/431.a62490cf.chunk.js": "/static/js/431.a62490cf.chunk.js",
"static/js/702.1692c400.chunk.js": "/static/js/702.1692c400.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.375f3683.js.map": "/static/js/main.375f3683.js.map",
"main.855cf2dc.js.map": "/static/js/main.855cf2dc.js.map",
"864.42bfc5f3.chunk.css.map": "/static/css/864.42bfc5f3.chunk.css.map",
"864.c97a284b.chunk.js.map": "/static/js/864.c97a284b.chunk.js.map",
"864.87464ec4.chunk.js.map": "/static/js/864.87464ec4.chunk.js.map",
"805.7c367e53.chunk.js.map": "/static/js/805.7c367e53.chunk.js.map",
"431.a62490cf.chunk.js.map": "/static/js/431.a62490cf.chunk.js.map",
"702.1692c400.chunk.js.map": "/static/js/702.1692c400.chunk.js.map",
Expand Down Expand Up @@ -195,6 +195,6 @@
"96.fe9915d5.chunk.js.map": "/static/js/96.fe9915d5.chunk.js.map"
},
"entrypoints": [
"static/js/main.375f3683.js"
"static/js/main.855cf2dc.js"
]
}
4 changes: 2 additions & 2 deletions admin/google-blockly/own/blocks_action.js
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ Blockly.JavaScript['http_get'] = function(block) {
const statement = Blockly.JavaScript.statementToCode(block, 'STATEMENT');
const unit = block.getFieldValue('UNIT');
let timeout = block.getFieldValue('TIMEOUT');
if (!timeout) {
if (isNaN(timeout)) {
timeout = 2000;
}
if (unit === 'sec') {
Expand Down Expand Up @@ -233,7 +233,7 @@ Blockly.JavaScript['http_post'] = function(block) {
const statement = Blockly.JavaScript.statementToCode(block, 'STATEMENT');
const unit = block.getFieldValue('UNIT');
let timeout = block.getFieldValue('TIMEOUT');
if (!timeout) {
if (isNaN(timeout)) {
timeout = 2000;
}
if (unit === 'sec') {
Expand Down
8 changes: 8 additions & 0 deletions admin/google-blockly/own/blocks_trigger.js
Original file line number Diff line number Diff line change
Expand Up @@ -834,6 +834,14 @@ Blockly.Blocks['schedule_create'] = {
this.setColour(Blockly.Trigger.HUE);
this.setTooltip(Blockly.Translate('schedule_create_tooltip'));
this.setHelpUrl(getHelp('schedule_create_help'));
},
isSchedule_: true,
getVars: function () {
return [this.getFieldValue('NAME')];
},
getVarModels: function () {
const name = this.getFieldValue('NAME');
return [{ getId: () => { return name; }, name: name, type: 'cron' }];
}
};

Expand Down

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion admin/tab.html

Large diffs are not rendered by default.

28 changes: 14 additions & 14 deletions io-package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,21 @@
"AlCalzone <[email protected]>",
"Matthias Kleine <[email protected]>"
],
"version": "7.10.0",
"version": "7.10.1",
"news": {
"7.10.1": {
"en": "Fixed cron trigger",
"de": "Fixed Cron Trigger",
"ru": "Фиксированный крон триггер",
"pt": "Gatilho cron fixo",
"nl": "Vaste cron trigger",
"fr": "Déclencheur cron fixe",
"it": "Attivazione del cron fisso",
"es": "Activador de cron fijo",
"pl": "Naprawiono wyzwalacz cron",
"uk": "Фіксований кроновий тригер",
"zh-cn": "固定线圈触发器"
},
"7.10.0": {
"en": "Added warning icon if state value is connected to trigger block (instead of object id)\nCopy date object in getAstroDate\nAdded object id as tooltip",
"de": "Warnsymbol hinzugefügt, wenn der Zustandswert mit Triggerblock verbunden ist (anstatt Objekt id)\nKopieren von Datumsobjekt in getAstro Datum\nObjekt-ID als Tooltip hinzugefügt",
Expand Down Expand Up @@ -100,19 +113,6 @@
"pl": "Dodano blok do tworzenia nowych obiektów\nDodano funkcję pobierania i wysyłania HTTP\nUpadłe wsparcie dla kawy (depregated od wersji 6.0.0)\nPodnieść ostrzeżenie, jeśli zarejestrowano więcej niż 100 wyzwalaczy\nStała kalkulacja stanu astro (i czas wyświetlania serwera w oknie dialogowym)",
"uk": "Додано блок для створення нових об'єктів\nДодано функцію HTTP get і post\nПодрібнена підтримка кав'ярні (з версії 6.0.0)\nРаїзне попередження, якщо було зареєстровано більше 100 тригерів\nВиправлено розрахунок стану астро (і відображення часу сервера в діалоговому вікні)",
"zh-cn": "添加块以创建新对象\n添加了 HTTP 获取和员额功能\n已放弃对咖啡标语的支持(自6.0.0版本起预告)\n如果超过100个触发器已登记,则发出警告\n固定的天体状态计算( 在对话框中显示服务器时间)"
},
"7.8.0": {
"en": "Added block for multiple or conditions\nRaised supported ecmaVersion from es2018 to es2021\nFixed getIdByName (returned the same id as array)",
"de": "Block für mehrere oder Bedingungen hinzugefügt\nRaised support ecmaVersion von es2018 bis es2021\nBehoben getIdByName (wie Array die gleiche ID zurückgegeben)",
"ru": "Добавление блока для нескольких или условий\nПовышение поддержки ecmaVersion с es2018 по es2021\nFixed getIdByName",
"pt": "Bloco adicionado para múltiplos ou condições\nEcmaVersion com suporte aumentado de es2018 para es2021\nFixed getIdByName (returned the same id as array)",
"nl": "Blok toegevoegd voor meerdere of voorwaarden\nVerhoogd ondersteund ecmaVersion van es2018 naar es2021\nFixed getIdByName (returned the same id as array)",
"fr": "Ajout de bloc pour plusieurs ou conditions\nEcmaVersion supportée depuis es2018 jusqu'à es2021\nCorrection de getIdByName (retourné le même id que le tableau)",
"it": "Aggiunto blocco per più o condizioni\nEcmaVersione supportata aumentata da es2018 a es2021\nGetIdByName fisso (ritornato lo stesso id come array)",
"es": "Bloque añadido para múltiples o condiciones\nEcmaVersión apoyada ampliada de es2018 a es2021\nReparado getIdByName (retornado el mismo id que array)",
"pl": "Dodany blok dla wielu lub warunków\nZwiększona wspierana ekowersja od es2018 do es2021\nNaprawiono getIdByName (zwracał ten sam id co tablica)",
"uk": "Додано блок для декількох або умов\nПідтримувана екскавація від es2018 до es2021\nВиправлено getIdByName (перевернуто той же ідентифікатор як масив)",
"zh-cn": "为多个或条件添加块\n从 es2018 升至 es2021 年支持的 ecmaVersion\n固定获取IdByName (返回的编号与数组相同)"
}
},
"desc": {
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "iobroker.javascript",
"version": "7.10.0",
"version": "7.10.1",
"description": "Rules Engine for ioBroker",
"author": "bluefox <[email protected]>",
"contributors": [
Expand Down
2 changes: 1 addition & 1 deletion src/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "js",
"version": "7.10.0",
"version": "7.10.1",
"private": true,
"dependencies": {
"@babel/plugin-proposal-private-property-in-object": "^7.21.11",
Expand Down

0 comments on commit a3b5ff6

Please sign in to comment.