wieerwill/platform
1
0
Fork 0
mirror of https://github.com/hcengineering/platform.git synced 2025-05-10 01:15:03 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

fix: close media popup on meeting leave

Browse Source 
Signed-off-by: Alexander Onnikov <Alexander.Onnikov@xored.com>
This commit is contained in:
Alexander Onnikov 2025-05-07 22:38:50 +07:00
parent 8fee443142
commit aaf5fe62a8
No known key found for this signature in database
GPG Key ID: 3320C3B3324E934C
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/love-resources/src/components/MediaPopupItemExt.svelte
View File

@ -4,13 +4,15 @@
import { Button } from '@hcengineering/ui' import { Button } from '@hcengineering/ui'
import view from '@hcengineering/view' import view from '@hcengineering/view'
import { DocNavLink } from '@hcengineering/view-resources' import { DocNavLink } from '@hcengineering/view-resources'
import { onMount } from 'svelte' import { createEventDispatcher, onMount } from 'svelte'
import love from '../plugin' import love from '../plugin'
import { currentRoom, infos, myInfo, myOffice, rooms, currentMeetingMinutes } from '../stores' import { currentRoom, infos, myInfo, myOffice, rooms, currentMeetingMinutes } from '../stores'
import { endMeeting, isCurrentInstanceConnected, leaveRoom } from '../utils' import { endMeeting, isCurrentInstanceConnected, leaveRoom } from '../utils'
export let limit: number = 4 export let limit: number = 4
const dispatch = createEventDispatcher()
$: isMyOffice = $myInfo?.room === $myOffice?._id $: isMyOffice = $myInfo?.room === $myOffice?._id
$: allowLeave = !isMyOffice && $myInfo?.room !== love.ids.Reception $: allowLeave = !isMyOffice && $myInfo?.room !== love.ids.Reception
@ -18,6 +20,7 @@
async function handleLeaveClick (): Promise<void> { async function handleLeaveClick (): Promise<void> {
leaving = true leaving = true
await leaveRoom($myInfo, $myOffice) await leaveRoom($myInfo, $myOffice)
dispatch('close')
} }
let ending = false let ending = false
@ -27,6 +30,7 @@
if (room !== undefined && isOffice(room) && $myInfo !== undefined) { if (room !== undefined && isOffice(room) && $myInfo !== undefined) {
await endMeeting(room, $rooms, $infos, $myInfo) await endMeeting(room, $rooms, $infos, $myInfo)
} }
dispatch('close')
} }
function formatElapsedTime (elapsed: number): string { function formatElapsedTime (elapsed: number): string {

2
plugins/media-resources/src/components/MediaState.svelte
View File

@ -34,7 +34,7 @@
<MicStateButton state={$state.microphone} /> <MicStateButton state={$state.microphone} />
<CamStateButton state={$state.camera} /> <CamStateButton state={$state.camera} />
<ComponentExtensions extension={media.extension.StateIndicator} /> <ComponentExtensions extension={media.extension.StateIndicator} on:close />
</div> </div>
<MediaSettingsButton disabled={!hasMediaDevices} /> <MediaSettingsButton disabled={!hasMediaDevices} />