chore: release v7.6.3

* (klein0r) Fixed bug in formatTimeDiff Blockly
ioBroker · Jan 11, 2024 · 8a762a7 · 8a762a7
1 parent 603069a
commit 8a762a7
Show file tree

Hide file tree

Showing 31 changed files with 59 additions and 54 deletions.
diff --git a/CHANGELOG_OLD.md b/CHANGELOG_OLD.md
@@ -1,4 +1,10 @@
 The newest change log is in README.md
+## 7.4.0 (2023-12-08)
+
+* (klein0r) Download script as xml file (export)
+* (klein0r) Import script as file (upload)
+* (klein0r) Hide global folder if expert mode is disabled
+
 ## 7.3.0 (2023-12-07)
 
 * (klein0r) Updated blockly logo

diff --git a/README.md b/README.md
@@ -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.6.3 (2024-01-11)
 
 * (klein0r) Fixed bug in formatTimeDiff Blockly
 
@@ -72,12 +72,6 @@ Since v5.5.0 of the JavaScript adapter the following locations (relative to the
 * (klein0r) Fixed layout of script type selection
 * (klein0r) Fixed sendto with multiple instances (for callback / timeout handling)
 
-### 7.4.0 (2023-12-08)
-
-* (klein0r) Download script as xml file (export)
-* (klein0r) Import script as file (upload)
-* (klein0r) Hide global folder if expert mode is disabled
-
 ## License
 The MIT License (MIT)
 

diff --git a/admin/asset-manifest.json b/admin/asset-manifest.json
@@ -1,8 +1,8 @@
 {
   "files": {
-    "main.js": "/static/js/main.20cfe954.js",
+    "main.js": "/static/js/main.10262ca6.js",
     "static/css/864.42bfc5f3.chunk.css": "/static/css/864.42bfc5f3.chunk.css",
-    "static/js/864.0720b367.chunk.js": "/static/js/864.0720b367.chunk.js",
+    "static/js/864.74e29d53.chunk.js": "/static/js/864.74e29d53.chunk.js",
     "static/js/805.7c367e53.chunk.js": "/static/js/805.7c367e53.chunk.js",
     "static/js/723.a75610c2.chunk.js": "/static/js/723.a75610c2.chunk.js",
     "static/js/66.ebb5d6fe.chunk.js": "/static/js/66.ebb5d6fe.chunk.js",
@@ -17,23 +17,23 @@
     "static/js/610.1561417c.chunk.js": "/static/js/610.1561417c.chunk.js",
     "static/js/715.7c0e8344.chunk.js": "/static/js/715.7c0e8344.chunk.js",
     "static/js/880.62623dec.chunk.js": "/static/js/880.62623dec.chunk.js",
-    "static/js/662.92ebdcc2.chunk.js": "/static/js/662.92ebdcc2.chunk.js",
+    "static/js/662.fec2a802.chunk.js": "/static/js/662.fec2a802.chunk.js",
     "static/js/399.f713c6bc.chunk.js": "/static/js/399.f713c6bc.chunk.js",
     "static/js/238.b904fead.chunk.js": "/static/js/238.b904fead.chunk.js",
     "static/js/77.9fe70d7d.chunk.js": "/static/js/77.9fe70d7d.chunk.js",
     "static/js/85.3afe2022.chunk.js": "/static/js/85.3afe2022.chunk.js",
     "static/js/983.3f5b808f.chunk.js": "/static/js/983.3f5b808f.chunk.js",
     "static/js/888.f2162868.chunk.js": "/static/js/888.f2162868.chunk.js",
-    "static/js/223.27df04f5.chunk.js": "/static/js/223.27df04f5.chunk.js",
+    "static/js/223.2ce55a07.chunk.js": "/static/js/223.2ce55a07.chunk.js",
     "static/js/895.9237a1ad.chunk.js": "/static/js/895.9237a1ad.chunk.js",
     "static/js/419.daaba277.chunk.js": "/static/js/419.daaba277.chunk.js",
     "static/js/562.8a3aa23b.chunk.js": "/static/js/562.8a3aa23b.chunk.js",
     "static/js/774.a3bcb017.chunk.js": "/static/js/774.a3bcb017.chunk.js",
     "static/js/956.8456a0f8.chunk.js": "/static/js/956.8456a0f8.chunk.js",
     "static/js/377.2f585ccd.chunk.js": "/static/js/377.2f585ccd.chunk.js",
-    "static/js/838.2787e424.chunk.js": "/static/js/838.2787e424.chunk.js",
+    "static/js/838.b6d6870a.chunk.js": "/static/js/838.b6d6870a.chunk.js",
     "static/js/17.ec756001.chunk.js": "/static/js/17.ec756001.chunk.js",
-    "static/js/917.5befffde.chunk.js": "/static/js/917.5befffde.chunk.js",
+    "static/js/917.05d2dfa0.chunk.js": "/static/js/917.05d2dfa0.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",
@@ -161,9 +161,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.20cfe954.js.map": "/static/js/main.20cfe954.js.map",
+    "main.10262ca6.js.map": "/static/js/main.10262ca6.js.map",
     "864.42bfc5f3.chunk.css.map": "/static/css/864.42bfc5f3.chunk.css.map",
-    "864.0720b367.chunk.js.map": "/static/js/864.0720b367.chunk.js.map",
+    "864.74e29d53.chunk.js.map": "/static/js/864.74e29d53.chunk.js.map",
     "805.7c367e53.chunk.js.map": "/static/js/805.7c367e53.chunk.js.map",
     "723.a75610c2.chunk.js.map": "/static/js/723.a75610c2.chunk.js.map",
     "66.ebb5d6fe.chunk.js.map": "/static/js/66.ebb5d6fe.chunk.js.map",
@@ -178,25 +178,25 @@
     "610.1561417c.chunk.js.map": "/static/js/610.1561417c.chunk.js.map",
     "715.7c0e8344.chunk.js.map": "/static/js/715.7c0e8344.chunk.js.map",
     "880.62623dec.chunk.js.map": "/static/js/880.62623dec.chunk.js.map",
-    "662.92ebdcc2.chunk.js.map": "/static/js/662.92ebdcc2.chunk.js.map",
+    "662.fec2a802.chunk.js.map": "/static/js/662.fec2a802.chunk.js.map",
     "399.f713c6bc.chunk.js.map": "/static/js/399.f713c6bc.chunk.js.map",
     "238.b904fead.chunk.js.map": "/static/js/238.b904fead.chunk.js.map",
     "77.9fe70d7d.chunk.js.map": "/static/js/77.9fe70d7d.chunk.js.map",
     "85.3afe2022.chunk.js.map": "/static/js/85.3afe2022.chunk.js.map",
     "983.3f5b808f.chunk.js.map": "/static/js/983.3f5b808f.chunk.js.map",
     "888.f2162868.chunk.js.map": "/static/js/888.f2162868.chunk.js.map",
-    "223.27df04f5.chunk.js.map": "/static/js/223.27df04f5.chunk.js.map",
+    "223.2ce55a07.chunk.js.map": "/static/js/223.2ce55a07.chunk.js.map",
     "895.9237a1ad.chunk.js.map": "/static/js/895.9237a1ad.chunk.js.map",
     "419.daaba277.chunk.js.map": "/static/js/419.daaba277.chunk.js.map",
     "562.8a3aa23b.chunk.js.map": "/static/js/562.8a3aa23b.chunk.js.map",
     "774.a3bcb017.chunk.js.map": "/static/js/774.a3bcb017.chunk.js.map",
     "956.8456a0f8.chunk.js.map": "/static/js/956.8456a0f8.chunk.js.map",
     "377.2f585ccd.chunk.js.map": "/static/js/377.2f585ccd.chunk.js.map",
-    "838.2787e424.chunk.js.map": "/static/js/838.2787e424.chunk.js.map",
+    "838.b6d6870a.chunk.js.map": "/static/js/838.b6d6870a.chunk.js.map",
     "17.ec756001.chunk.js.map": "/static/js/17.ec756001.chunk.js.map",
-    "917.5befffde.chunk.js.map": "/static/js/917.5befffde.chunk.js.map"
+    "917.05d2dfa0.chunk.js.map": "/static/js/917.05d2dfa0.chunk.js.map"
   },
   "entrypoints": [
-    "static/js/main.20cfe954.js"
+    "static/js/main.10262ca6.js"
   ]
 }
diff --git a/admin/google-blockly/own/blocks_convert.js b/admin/google-blockly/own/blocks_convert.js
@@ -369,17 +369,9 @@ Blockly.Blocks.convert_time_difference = {
 Blockly.JavaScript.convert_time_difference = function (block) {
     const option = block.getFieldValue('OPTION');
     const format = block.getFieldValue('FORMAT');
-
     const value = Blockly.JavaScript.valueToCode(block, 'VALUE', Blockly.JavaScript.ORDER_ATOMIC);
 
-    let code;
-    if (option === 'custom') {
-        code = `formatTimeDiff(getDateObject(${value}), '${format}')`;
-    } else {
-        code = `formatTimeDiff(getDateObject(${value}), '${option}')`;
-    }
-
-    return [code, Blockly.JavaScript.ORDER_ATOMIC];
+    return [`formatTimeDiff(${value}, '${option === 'custom' ? format : option}')`, Blockly.JavaScript.ORDER_ATOMIC];
 };
 
 // --- json2object --------------------------------------------------