Skip to content

A self-hosted media server and file management system

fix: player context menu has no items if opened first

aminnausindffa0b128165
diff --git a/resources/js/components/video/VideoPlayer.vue b/resources/js/components/video/VideoPlayer.vue
index 62b5f804..d175b7e7 100755
--- a/resources/js/components/video/VideoPlayer.vue
+++ b/resources/js/components/video/VideoPlayer.vue
@@ -133,8 +133,8 @@ const {
showAutoSubtitles,
showSeekButtons,
} = storeToRefs(useAppStore());
+const { setContextMenu, closeContextMenu } = useAppStore();
const { updateViewCount } = useContentStore();
-const { setContextMenu } = useAppStore();
const { createRecord } = useRecord();
const { stateVideo, stateFolder, nextVideoURL, previousVideoURL } = storeToRefs(useContentStore());
@@ -830,6 +830,9 @@ const cycleViewMode = async (mode: PlayerViewMode) => {
viewMode.value = 'normal';
break;
}
+
+ if (playerContextMenu.value?.contextMenuOpen) playerContextMenu.value?.contextMenuToggle();
+ closeContextMenu();
};
const handleTheatre = () => {
@@ -849,8 +852,6 @@ const handleFullScreen = async () => {
toast.error('Unable to switch fullscreen mode...');
console.log(error);
}
-
- if (playerContextMenu.value?.contextMenuOpen) playerContextMenu.value?.contextMenuToggle();
};
const handleFullScreenChange = (e: Event) => {
@@ -1359,8 +1360,10 @@ defineExpose({
@mouseleave="handleControlsTimeout"
@contextmenu="
(e: any) => {
- if (isNormalView) setContextMenu(e, { items: playerContextMenuItems });
- else playerContextMenu?.contextMenuToggle(e, true);
+ setContextMenu(e, { items: playerContextMenuItems }, isNormalView);
+ if (!isNormalView) {
+ playerContextMenu?.contextMenuToggle(e, true);
+ }
}
"
>
diff --git a/resources/js/stores/AppStore.ts b/resources/js/stores/AppStore.ts
index ef099cb4..907b5195 100644
--- a/resources/js/stores/AppStore.ts
+++ b/resources/js/stores/AppStore.ts
@@ -112,14 +112,14 @@ export const useAppStore = defineStore('App', () => {
scrollLock.value = state;
}
- const setContextMenu = (event: MouseEvent, options: ContextMenuType) => {
+ const setContextMenu = (event: MouseEvent, options: ContextMenuType, toggleContextMenu: boolean = true) => {
if (!options.items || options.items.length === 0) return;
contextMenuEvent.value = event;
contextMenuItems.value = options.items ?? contextMenuItems.value;
contextMenuStyle.value = options.style ?? '';
contextMenuItemStyle.value = options.itemStyle ?? '';
- contextMenu.value?.contextMenuToggle(event);
+ if (toggleContextMenu) contextMenu.value?.contextMenuToggle(event);
};
//#region WebSockets
@@ -211,6 +211,7 @@ export const useAppStore = defineStore('App', () => {
contextMenuItemStyle,
contextMenuEvent,
setContextMenu,
+ closeContextMenu: () => contextMenu.value?.contextMenuToggle(),
// Ws State
createEcho,