Skip to content

Commit

Permalink
Merge pull request #144 from jemu75/dev-v4
Browse files Browse the repository at this point in the history
v4.8.1
  • Loading branch information
jemu75 authored Jan 19, 2025
2 parents 4226196 + 3c01e4c commit fee1d65
Show file tree
Hide file tree
Showing 10 changed files with 56 additions and 60 deletions.
5 changes: 5 additions & 0 deletions public/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
# v4.8.1 (12.01.2025)
## Button
- Bugfix for popout command
## iFrame
- Bugfix for width on Resizing
# v4.8.0 (11.01.2025)
## Button
- new command type popout
Expand Down
6 changes: 3 additions & 3 deletions src/components/PanelMainBtn.vue
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,10 @@
if(obj.type === 'route') router.push({ name: 'devices', params: { view: obj.cmd }, query: router.currentRoute.value.query })
if(obj.type === 'url') window.open(obj.cmd, '_self')
if(obj.type === 'popout') {
let name = /panel=/.test(obj.cmd) ? obj.cmd.split('panel=')[1].split(' ')[0] : -1,
width = /width=/.test(obj.cmd) ? obj.cmd.split('width=')[1].split(' ')[0] : '400px',
let name = /panel=/.test(obj.cmd) ? obj.cmd.split('panel=')[1].split(' width=')[0] : -1,
width = /width=/.test(obj.cmd) ? obj.cmd.split('width=')[1] : '400px',
panel = fhem.app.panelList.map((e) => e.name).indexOf(name)
if(panel !== -1) fhem.app.popOutList.push({ show: true, width, panel })
}
}
Expand Down
30 changes: 7 additions & 23 deletions src/components/PanelMainIframe.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<script setup>
import { computed, ref, onMounted } from 'vue'
import { computed, onMounted, ref } from 'vue'
import { useFhemStore } from '@/stores/fhem'
const props = defineProps({
Expand All @@ -11,8 +11,6 @@
const fhem = useFhemStore()
const extContent = ref()
const width = ref()
const height = ref(/=maximized$/.test(fhem.app.currentView) ? (window.innerHeight - 170) : props.height)
const content = computed(() => {
Expand All @@ -24,27 +22,13 @@
return res
})
function refreshIframe() {
if(extContent.value) width.value = extContent.value.scrollWidth
}
onMounted(() => {
window.addEventListener('resize', refreshIframe)
refreshIframe()
})
</script>

<template>
<div>
<div ref="extContent"></div>
<iframe
:src="content.source"
:width="width"
:height="height"
:loading="content.lazy"
style="border:none;">
</iframe>
</div>
<iframe
:src="content.source"
:loading="content.lazy"
:height="height"
style="border:none; width:100%;">
</iframe>
</template>
7 changes: 7 additions & 0 deletions www/fhemapp4/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
# v4.8.1 (12.01.2025)
## Button
- Bugfix for popout command
## iFrame
- Bugfix for width on Resizing
# v4.8.0 (11.01.2025)
## Button
- new command type popout
## iFrame
- bugfix in case of resizing panels
# v4.7.0 (05.01.2025)
## Core
- Optimization of Reconnect and Refreshing Session
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit fee1d65

Please sign in to comment.