v3.36.4

jemu75 · Jan 17, 2024 · 5f2ca99 · 5f2ca99
1 parent afe87e8
commit 5f2ca99
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 19 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,8 @@
 # Versionsinformationen
+## v.3.36.4 (17.01.2024)
+**Bugfix**
+- Standard-Template: Ersetzung %d wird jetzt bei allen FHEM Kommando's berücksichtigt
+
 ## v.3.36.3 (15.11.2023)
 **Bugfix**
 - core: Anpassung im Modul createConnected

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fhemapp",
-  "version": "3.36.3", 
+  "version": "3.36.4", 
   "private": true,
   "author": "jemu75",
   "scripts": {

diff --git a/src/components/TemplDefault.vue b/src/components/TemplDefault.vue
@@ -132,7 +132,7 @@
                         <v-list-item
                           v-for="(menu, i) in level.leftMenu"
                           :key="i"
-                          @click="sendMenuCmd(menu.cmd)"
+                          @click="sendCmd(menu.cmd)"
                         >
                           <v-list-item-content>
                             <v-list-item-title class="text-subtitle-1">
@@ -238,7 +238,7 @@
                         <v-list-item
                           v-for="(menu, i) in level.midMenu"
                           :key="i"
-                          @click="sendMenuCmd(menu.cmd)"
+                          @click="sendCmd(menu.cmd)"
                         >
                           <v-list-item-content>
                             <v-list-item-title class="text-subtitle-1">
@@ -356,7 +356,7 @@
                         <v-list-item
                           v-for="(menu, i) in level.rightMenu"
                           :key="i"
-                          @click="sendMenuCmd(menu.cmd)"
+                          @click="sendCmd(menu.cmd)"
                         >
                           <v-list-item-content>
                             <v-list-item-title class="text-subtitle-1">
@@ -482,6 +482,9 @@
 
     methods: {
       sendCmd(cmd, delay) {
+        let device = this.$fhem.getEl(this.item, 'Internals', 'NAME');
+        if(/%d/.test(cmd)) cmd = cmd.replace('%d', device);
+
         if(!delay) {
           this.$fhem.request(cmd);
         } else {
@@ -496,12 +499,6 @@
         }
       },
 
-      sendMenuCmd(cmd) {
-        let device = this.$fhem.getEl(this.item, 'Internals', 'NAME');
-        if(/%d/.test(cmd)) cmd = cmd.replace('%d', device);
-        this.sendCmd(cmd);
-      },
-
       updateReading(cmd) {
         let cmdParts = cmd.split(' ');
 

diff --git a/www/fhemapp/css/281.7dde73af.css → www/fhemapp/css/417.7dde73af.css b/www/fhemapp/css/281.7dde73af.css → www/fhemapp/css/417.7dde73af.css
diff --git a/www/fhemapp/index.html b/www/fhemapp/index.html
@@ -1 +1 @@
-<!doctype html><html lang="de"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"><meta name="mobile-web-app-capable" content="yes"><meta name="apple-mobile-web-app-capable" content="yes"><link rel="icon" href="favicon.png"><link rel="apple-touch-icon" href="apple-touch-icon.png"><title>fhemapp</title><script defer="defer" src="js/chunk-vendors.d1ade8f2.js"></script><script defer="defer" src="js/app.3a10ee7e.js"></script><link href="css/chunk-vendors.d5cb8535.css" rel="stylesheet"><link href="css/app.9b8c7eb5.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but fhemapp doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>
+<!doctype html><html lang="de"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"><meta name="mobile-web-app-capable" content="yes"><meta name="apple-mobile-web-app-capable" content="yes"><link rel="icon" href="favicon.png"><link rel="apple-touch-icon" href="apple-touch-icon.png"><title>fhemapp</title><script defer="defer" src="js/chunk-vendors.d1ade8f2.js"></script><script defer="defer" src="js/app.34f80ee8.js"></script><link href="css/chunk-vendors.d5cb8535.css" rel="stylesheet"><link href="css/app.9b8c7eb5.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but fhemapp doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>
diff --git a/www/fhemapp/js/281.29613014.js b/www/fhemapp/js/281.29613014.js
diff --git a/www/fhemapp/js/417.f4681533.js b/www/fhemapp/js/417.f4681533.js
diff --git a/www/fhemapp/js/696.d60c7bcb.js → www/fhemapp/js/696.372d00b4.js b/www/fhemapp/js/696.d60c7bcb.js → www/fhemapp/js/696.372d00b4.js
diff --git a/www/fhemapp/js/app.3a10ee7e.js → www/fhemapp/js/app.34f80ee8.js b/www/fhemapp/js/app.3a10ee7e.js → www/fhemapp/js/app.34f80ee8.js
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<!doctype html><html lang="de"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"><meta name="mobile-web-app-capable" content="yes"><meta name="apple-mobile-web-app-capable" content="yes"><link rel="icon" href="favicon.png"><link rel="apple-touch-icon" href="apple-touch-icon.png"><title>fhemapp</title><script defer="defer" src="js/chunk-vendors.d1ade8f2.js"></script><script defer="defer" src="js/app.3a10ee7e.js"></script><link href="css/chunk-vendors.d5cb8535.css" rel="stylesheet"><link href="css/app.9b8c7eb5.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but fhemapp doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>
		<!doctype html><html lang="de"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"><meta name="mobile-web-app-capable" content="yes"><meta name="apple-mobile-web-app-capable" content="yes"><link rel="icon" href="favicon.png"><link rel="apple-touch-icon" href="apple-touch-icon.png"><title>fhemapp</title><script defer="defer" src="js/chunk-vendors.d1ade8f2.js"></script><script defer="defer" src="js/app.34f80ee8.js"></script><link href="css/chunk-vendors.d5cb8535.css" rel="stylesheet"><link href="css/app.9b8c7eb5.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but fhemapp doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>