Merge pull request #96 from jemu75/dev-v4

v4.1.2
jemu75 · May 2, 2024 · eebb5fd · eebb5fd
2 parents 086eadf + bffbf60
commit eebb5fd
Show file tree

Hide file tree

Showing 12 changed files with 30 additions and 19 deletions.
diff --git a/public/CHANGELOG.md b/public/CHANGELOG.md
@@ -1,3 +1,8 @@
+# v4.1.2 (02.05.2024)
+## Settings
+- bugfix back button at panel and template settings
+## Panel Button
+- bugfix for touchdevices
 # v4.1.1 (29.04.2024)
 ## Panel Button
 - bugfix if fhem command will be send

diff --git a/src/components/AppNavigation.vue b/src/components/AppNavigation.vue
@@ -21,10 +21,9 @@
 </script>
 
 <template>
-  <span v-for="(item, idx) of items" :key="item.name">
+  <span v-for="(item, idx) of items" :key="idx">
     <v-list-item
       v-if="(!item.group || item.group.length < 1) && !isChip" 
-      :key="idx"
       :title="fhem.replacer(item.title, '') || item.name"
       :prepend-icon="item.icon"
       rounded="pill"
@@ -35,7 +34,6 @@
       v-if="(!item.group || item.group.length < 1) && isChip"
       class="my-1 ml-2"
       :prepend-icon="item.icon"
-      :key="idx"
       @click="loadView(idx)"
     >
       {{ fhem.replacer(item.title, '') || item.name }}

diff --git a/src/components/PanelMainBtn.vue b/src/components/PanelMainBtn.vue
@@ -55,16 +55,17 @@
     function btnClick(evt) {
         let click = fhem.handleDefs(props.el.click, ['cmd', 'type'], ['', 'cmd'], false, null, true),
             longClick = fhem.handleDefs(props.el.longClick, ['cmd', 'type'], ['', 'cmd'], false, null, true),
-            longRelease = fhem.handleDefs(props.el.longRelease, ['cmd', 'type'], ['', 'cmd'], false, null, true)
+            longRelease = fhem.handleDefs(props.el.longRelease, ['cmd', 'type'], ['', 'cmd'], false, null, true),
+            isTouch = 'ontouchstart' in document
 
-        if(evt === 'mouseStart') {
+        if((!isTouch && evt === 'mouseStart') || evt === 'touchStart') {
             btnState.timer = setTimeout(() => {
                 btnState.long = true
                 if(longClick.cmd) doCmd(longClick)
             }, 1000)
         }
 
-        if(evt === 'mouseEnd') {
+        if((!isTouch && evt === 'mouseEnd') || evt === 'touchEnd') {
             if(btnState.long) {
                 if(longRelease.cmd) doCmd(longRelease)
             } else {
@@ -91,7 +92,9 @@
         :disabled="btn.disabled" 
         :color="btn.color" 
         @mousedown="btnClick('mouseStart')"
+        @touchstart="btnClick('touchStart')"
         @mouseup="btnClick('mouseEnd')"
+        @touchend="btnClick('touchEnd')"
         class="my-2">
         <v-icon size="large">
             {{ btn.icon }}

diff --git a/src/components/SettingsProps.vue b/src/components/SettingsProps.vue
@@ -184,7 +184,7 @@
     }
 
     watch(router.currentRoute, (val) => {
-        if(val.params.item) editItem(val.params.item)
+        editItem(val.params.item)
     })
 
     watch(() => fhem.app.isReady, (val) => {

diff --git a/www/fhemapp4/CHANGELOG.md b/www/fhemapp4/CHANGELOG.md
@@ -1,3 +1,8 @@
+# v4.1.2 (02.05.2024)
+## Settings
+- bugfix back button at panel and template settings
+## Panel Button
+- bugfix for touchdevices
 # v4.1.1 (29.04.2024)
 ## Panel Button
 - bugfix if fhem command will be send

diff --git a/www/fhemapp4/assets/DevicesView-e2ac3b22.js → www/fhemapp4/assets/DevicesView-d63af316.js b/www/fhemapp4/assets/DevicesView-e2ac3b22.js → www/fhemapp4/assets/DevicesView-d63af316.js
diff --git a/...fhemapp4/assets/InternalsView-0c63f870.js → ...fhemapp4/assets/InternalsView-09b81863.js b/...fhemapp4/assets/InternalsView-0c63f870.js → ...fhemapp4/assets/InternalsView-09b81863.js