Improve subscription & unsubscription logic

Signed-off-by: Florian Hotze <[email protected]>
openhab · Oct 6, 2024 · 49a7307 · 49a7307
1 parent 1252f3d
commit 49a7307
Showing 1 changed file with 15 additions and 15 deletions.
diff --git a/bundles/org.openhab.ui/web/src/components/widgets/layout/oh-canvas-layout.vue b/bundles/org.openhab.ui/web/src/components/widgets/layout/oh-canvas-layout.vue
@@ -95,6 +95,7 @@
       }">
       <div
         v-if="config.imageUrl || config.imageSrcSet"
+        v-show="!config.embedSvg || embeddedSvgReady"
         ref="canvasBackground"
         style="
           height: inherit;
@@ -169,10 +170,10 @@
 
 <script>
 import mixin from '../widget-mixin'
-import OhCanvasLayer from './oh-canvas-layer'
-import { OhCanvasLayoutDefinition } from '@/assets/definitions/widgets/layout'
 import { basicActionsMixin } from '@/components/widgets/widget-basic-actions'
 import embeddedSvgMixin from '@/components/widgets/layout/oh-canvas-embedded-svg-mixin'
+import OhCanvasLayer from './oh-canvas-layer'
+import { OhCanvasLayoutDefinition } from '@/assets/definitions/widgets/layout'
 
 export default {
   emits: ['svgOnClickConfigUpdate'],
@@ -225,27 +226,26 @@ export default {
     this.$fullscreen.support = true
     this.canvasLayoutStyle()
     this.computeLayout()
-  },
-  mounted () {
-    // Chrome reports a wrong size in fullscreen, store initial resolution and use non-dynamically.
-    this.windowWidth = window.screen.width
-    this.windowHeight = window.screen.height
 
     if (this.config.embedSvg) {
-      if (!this.embeddedSvgReady) {
-        this.embedSvg().then(() => {
-          this.subscribeEmbeddedSvgListeners()
-          this.setupEmbeddedSvgStateTracking()
-          this.embeddedSvgReady = true
-        })
-      } else {
+      this.embedSvg().then(() => {
         this.subscribeEmbeddedSvgListeners()
         this.setupEmbeddedSvgStateTracking()
-      }
+        this.embeddedSvgReady = true
+      })
     }
   },
+  mounted () {
+    // Chrome reports a wrong size in fullscreen, store initial resolution and use non-dynamically.
+    this.windowWidth = window.screen.width
+    this.windowHeight = window.screen.height
+  },
   beforeDestroy () {
+    if (!this.context.editmode) {
+      window.removeEventListener('resize', this.setDimensions)
+    }
     if (this.config.embedSvg && this.embeddedSvgReady) {
+      this.embeddedSvgReady = false
       this.unsubscribeEmbeddedSvgListeners()
       this.unsubscribeEmbeddedSvgStateTracking()
     }