revoke last changes

knowthelist · Jan 28, 2024 · bfa1109 · bfa1109
1 parent e4d4c73
commit bfa1109
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 12 deletions.
diff --git a/controls_ftui.txt b/controls_ftui.txt
@@ -729,7 +729,7 @@ UPD 2021-02-01_19:44:50 5063 www/ftui/modules/circle-menu/circle-menu.min.js
 UPD 2022-05-25_18:05:01 14463 www/ftui/modules/ftui/fhem.service.js
 UPD 2024-01-24_21:38:22 8347 www/ftui/modules/ftui/ftui.app.js
 UPD 2024-01-19_17:33:44 13029 www/ftui/modules/ftui/ftui.binding.js
-UPD 2024-01-28_13:19:50 14412 www/ftui/modules/ftui/ftui.helper.js
+UPD 2024-01-28_13:53:42 14420 www/ftui/modules/ftui/ftui.helper.js
 UPD 2020-12-31_16:39:06 9247 www/ftui/modules/hocon/hocon.js
 UPD 2020-12-31_16:39:06 3192 www/ftui/modules/hocon/hocon.min.js
 UPD 2021-10-13_09:24:35 65090 www/ftui/modules/iro.js/iro.js

diff --git a/www/ftui/modules/ftui/ftui.helper.js b/www/ftui/modules/ftui/ftui.helper.js
@@ -211,17 +211,16 @@ export function capitalize(s) {
 // date functions
 
 export function dateFromString(str) {
-  if (str && str.match(/(\d+)-(\d+)-(\d+)[_\s](\d+):(\d+):(\d+).*/)){
-    return new Date(+m[1], +m[2] - 1, +m[3], +m[4], +m[5], +m[6]);
-  } else if (str && str.match(/(\d\d).(\d\d).(\d\d\d\d)/)) {
-    return new Date(+m3[3], +m3[2] - 1, +m3[1], 0, -offset, 0, 0);
-  } else if (str && str.match(/(\d\d\d\d)-(\d\d)-(\d\d)/)) {
-    return new Date(+m4[1], +m4[2] - 1, +m4[3], 0, -offset, 0, 0);
-  } else if (str && str.match(/^(\d+)$/)) {
-    return new Date(70, 0, 1, 0, 0, m2[1], 0);
-  } else {
-    return new Date();
-  }
+  const m = str.match(/(\d+)-(\d+)-(\d+)[_\s](\d+):(\d+):(\d+).*/);
+  const m2 = str.match(/^(\d+)$/);
+  const m3 = str.match(/(\d\d).(\d\d).(\d\d\d\d)/);
+  const m4 = str.match(/(\d\d\d\d)-(\d\d)-(\d\d)/);s
+  const offset = new Date().getTimezoneOffset();
+
+  return (m) ? new Date(+m[1], +m[2] - 1, +m[3], +m[4], +m[5], +m[6])
+    : (m2) ? new Date(70, 0, 1, 0, 0, m2[1], 0)
+      : (m3) ? new Date(+m3[3], +m3[2] - 1, +m3[1], 0, -offset, 0, 0) 
+      : (m4) ? new Date(+m4[1], +m4[2] - 1, +m4[3], 0, -offset, 0, 0): new Date();
 }
 
 export function dateFormat(date, format) {