fix(ui): hide open in new window inside popup window

zwave-js · Jun 26, 2024 · 28dc90b · 28dc90b
1 parent ab7634b
commit 28dc90b
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/src/lib/utils.js b/src/lib/utils.js
@@ -311,6 +311,10 @@ export function openInWindow(title, height = 800, width = 600) {
 	}
 }
 
+export function isPopupWindow() {
+	return window.opener !== null && window.opener !== window;
+  }
+
 export function getProtocolIcon(protocol) {
 	if (typeof protocol === 'boolean') {
 		protocol = protocol ? Protocols.ZWaveLongRange : Protocols.ZWave

diff --git a/src/views/Debug.vue b/src/views/Debug.vue
@@ -91,7 +91,7 @@ import { socketEvents } from '@server/lib/SocketEvents'
 import { AnsiUp } from 'ansi_up'
 import { mapState, mapActions } from 'pinia'
 import useBaseStore from '../stores/base.js'
-import { openInWindow } from '../lib/utils'
+import { isPopupWindow, openInWindow } from '../lib/utils'
 
 const ansiUp = new AnsiUp()
 
@@ -152,7 +152,7 @@ export default {
 					color: 'primary',
 					tooltip: 'Open in window',
 					action: this.newWindow,
-					disabled: false,
+					disabled: isPopupWindow(),
 				},
 			]
 		},

diff --git a/src/views/Zniffer.vue b/src/views/Zniffer.vue
@@ -300,7 +300,7 @@
 				<v-card-title> Settings </v-card-title>
 				<v-card-text>
 					<v-row>
-						<v-col cols="12">
+						<v-col v-if="!isPopup" cols="12">
 							<v-btn
 								text
 								small
@@ -354,6 +354,7 @@ import {
 	humanFriendlyNumber,
 	openInWindow,
 	getProtocolIcon,
+	isPopupWindow,
 } from '../lib/utils'
 
 export default {
@@ -421,7 +422,7 @@ export default {
 		endHeight() {
 			const lastIndex = this.start + this.perPage
 			return this.rowHeight * (this.totalFrames - lastIndex + 1)
-		},
+		}
 	},
 	watch: {
 		topPaneHeight() {
@@ -504,6 +505,7 @@ export default {
 	data() {
 		return {
 			znifferRegions,
+			isPopup: isPopupWindow(),
 			fab: false,
 			drawer: false,
 			frequency: null,