UPSTREAM BASELINE: nextcloud/spreed v22.0.12 (без изменений)
Type checking / changes (push) Has been cancelled
Type checking / test (push) Has been cancelled
Type checking / typescript-summary (push) Has been cancelled
Node tests / changes (push) Has been cancelled
Node tests / test (push) Has been cancelled
Node tests / test-summary (push) Has been cancelled
Type checking / changes (push) Has been cancelled
Type checking / test (push) Has been cancelled
Type checking / typescript-summary (push) Has been cancelled
Node tests / changes (push) Has been cancelled
Node tests / test (push) Has been cancelled
Node tests / test-summary (push) Has been cancelled
Источник: https://github.com/nextcloud/spreed/archive/refs/tags/v22.0.12.tar.gz С этого коммита ветка официального Nextcloud Talk отрезана (решение владельца 2026-07-06). Все дальнейшие изменения — только наши; версии релизов: 22.0.12-f7.N.
This commit is contained in:
@@ -0,0 +1,306 @@
|
||||
<!--
|
||||
- SPDX-FileCopyrightText: 2023 Nextcloud GmbH and Nextcloud contributors
|
||||
- SPDX-License-Identifier: AGPL-3.0-or-later
|
||||
-->
|
||||
|
||||
<template>
|
||||
<div class="local-video-control-wrapper">
|
||||
<NcButton
|
||||
:title="videoButtonTitle"
|
||||
:variant="videoStreamError ? 'error' : variant"
|
||||
:aria-label="videoButtonAriaLabel"
|
||||
:class="{
|
||||
'no-video-available': !isVideoAvailable,
|
||||
'video-control-button': showDevices,
|
||||
}"
|
||||
:disabled="resumeVideoAfterChange"
|
||||
@click.stop="toggleVideo">
|
||||
<template #icon>
|
||||
<IconVideo v-if="showVideoOn || resumeVideoAfterChange" :size="20" />
|
||||
<IconVideoOffOutline v-else :size="20" />
|
||||
</template>
|
||||
</NcButton>
|
||||
|
||||
<NcActions
|
||||
v-if="showDevices"
|
||||
:disabled="!isVideoAvailable || !isVideoAllowed || !!videoStreamError"
|
||||
class="video-selector-button"
|
||||
@open="updateDevices">
|
||||
<template #icon>
|
||||
<IconChevronUp :size="16" />
|
||||
</template>
|
||||
<NcActionCaption :name="t('spreed', 'Select a video device')" />
|
||||
<NcActionButton
|
||||
v-for="device in videoDevices"
|
||||
:key="device.deviceId ?? 'none'"
|
||||
class="video-selector__action"
|
||||
type="radio"
|
||||
:modelValue="videoInputId"
|
||||
:value="device.deviceId"
|
||||
:title="device.label"
|
||||
@click="handleVideoInputIdChange(device.deviceId)">
|
||||
{{ device.label }}
|
||||
</NcActionButton>
|
||||
</NcActions>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import { emit } from '@nextcloud/event-bus'
|
||||
import { t } from '@nextcloud/l10n'
|
||||
import { useHotKey } from '@nextcloud/vue/composables/useHotKey'
|
||||
import { ref } from 'vue'
|
||||
import NcActionButton from '@nextcloud/vue/components/NcActionButton'
|
||||
import NcActionCaption from '@nextcloud/vue/components/NcActionCaption'
|
||||
import NcActions from '@nextcloud/vue/components/NcActions'
|
||||
import NcButton from '@nextcloud/vue/components/NcButton'
|
||||
import IconChevronUp from 'vue-material-design-icons/ChevronUp.vue'
|
||||
import IconVideo from 'vue-material-design-icons/Video.vue' // Filled for better indication
|
||||
import IconVideoOffOutline from 'vue-material-design-icons/VideoOffOutline.vue'
|
||||
import { useDevices } from '../../../composables/useDevices.js'
|
||||
import { PARTICIPANT } from '../../../constants.ts'
|
||||
|
||||
export default {
|
||||
name: 'LocalVideoControlButton',
|
||||
|
||||
components: {
|
||||
NcActions,
|
||||
NcActionButton,
|
||||
NcActionCaption,
|
||||
NcButton,
|
||||
IconChevronUp,
|
||||
IconVideo,
|
||||
IconVideoOffOutline,
|
||||
},
|
||||
|
||||
props: {
|
||||
conversation: {
|
||||
type: Object,
|
||||
required: true,
|
||||
},
|
||||
|
||||
model: {
|
||||
type: Object,
|
||||
required: true,
|
||||
},
|
||||
|
||||
disableKeyboardShortcuts: {
|
||||
type: Boolean,
|
||||
default: OCP.Accessibility.disableKeyboardShortcuts(),
|
||||
},
|
||||
|
||||
variant: {
|
||||
type: String,
|
||||
default: 'tertiary-no-background',
|
||||
},
|
||||
|
||||
token: {
|
||||
type: String,
|
||||
required: true,
|
||||
},
|
||||
|
||||
showDevices: {
|
||||
type: Boolean,
|
||||
default: false,
|
||||
},
|
||||
},
|
||||
|
||||
setup(props) {
|
||||
const {
|
||||
devices,
|
||||
videoInputId,
|
||||
videoStreamError,
|
||||
updateDevices,
|
||||
updatePreferences,
|
||||
subscribeToDevices,
|
||||
unsubscribeFromDevices,
|
||||
} = useDevices()
|
||||
|
||||
/* Flag to smoothly toggle the video while in call */
|
||||
const resumeVideoAfterChange = ref(false)
|
||||
|
||||
return {
|
||||
devices,
|
||||
videoInputId,
|
||||
videoStreamError,
|
||||
updateDevices,
|
||||
updatePreferences,
|
||||
subscribeToDevices,
|
||||
unsubscribeFromDevices,
|
||||
resumeVideoAfterChange,
|
||||
}
|
||||
},
|
||||
|
||||
computed: {
|
||||
isVideoAllowed() {
|
||||
return this.conversation.permissions & PARTICIPANT.PERMISSIONS.PUBLISH_VIDEO
|
||||
},
|
||||
|
||||
isVideoAvailable() {
|
||||
return this.model.attributes.videoAvailable
|
||||
},
|
||||
|
||||
showVideoOn() {
|
||||
return this.isVideoAvailable && this.model.attributes.videoEnabled
|
||||
},
|
||||
|
||||
videoButtonTitle() {
|
||||
if (!this.isVideoAllowed) {
|
||||
return t('spreed', 'You are not allowed to enable video')
|
||||
}
|
||||
|
||||
if (!this.isVideoAvailable) {
|
||||
return t('spreed', 'No video. Click to select device')
|
||||
}
|
||||
|
||||
if (this.model.attributes.videoEnabled) {
|
||||
return this.disableKeyboardShortcuts
|
||||
? t('spreed', 'Disable video')
|
||||
: t('spreed', 'Disable video (V)')
|
||||
}
|
||||
|
||||
if (!this.model.getWebRtc() || !this.model.getWebRtc().connection || this.model.getWebRtc().connection.getSendVideoIfAvailable()) {
|
||||
return this.disableKeyboardShortcuts
|
||||
? t('spreed', 'Enable video')
|
||||
: t('spreed', 'Enable video (V)')
|
||||
}
|
||||
|
||||
return this.disableKeyboardShortcuts
|
||||
? t('spreed', 'Enable video - Your connection will be briefly interrupted when enabling the video for the first time')
|
||||
: t('spreed', 'Enable video (V) - Your connection will be briefly interrupted when enabling the video for the first time')
|
||||
},
|
||||
|
||||
videoButtonAriaLabel() {
|
||||
if (!this.isVideoAvailable) {
|
||||
return t('spreed', 'No video. Click to select device')
|
||||
}
|
||||
|
||||
if (this.model.attributes.videoEnabled) {
|
||||
return t('spreed', 'Disable video')
|
||||
}
|
||||
|
||||
if (!this.model.getWebRtc() || !this.model.getWebRtc().connection || this.model.getWebRtc().connection.getSendVideoIfAvailable()) {
|
||||
return t('spreed', 'Enable video')
|
||||
}
|
||||
|
||||
return t('spreed', 'Enable video. Your connection will be briefly interrupted when enabling the video for the first time')
|
||||
},
|
||||
|
||||
videoDevices() {
|
||||
return [
|
||||
...this.devices.filter((device) => device.kind === 'videoinput')
|
||||
.map((device) => ({
|
||||
deviceId: device.deviceId,
|
||||
label: device.label || device.fallbackLabel,
|
||||
})),
|
||||
{ deviceId: null, label: t('spreed', 'None') },
|
||||
]
|
||||
},
|
||||
},
|
||||
|
||||
watch: {
|
||||
isVideoAvailable(newValue) {
|
||||
if (newValue && this.resumeVideoAfterChange) {
|
||||
// New track is available, resume video
|
||||
this.model.enableVideo()
|
||||
this.resumeVideoAfterChange = false
|
||||
}
|
||||
},
|
||||
|
||||
videoInputId(newValue) {
|
||||
if (!newValue && this.resumeVideoAfterChange) {
|
||||
this.resumeVideoAfterChange = false
|
||||
}
|
||||
},
|
||||
},
|
||||
|
||||
created() {
|
||||
useHotKey('v', this.toggleVideo)
|
||||
},
|
||||
|
||||
mounted() {
|
||||
this.subscribeToDevices()
|
||||
},
|
||||
|
||||
beforeUnmount() {
|
||||
this.unsubscribeFromDevices()
|
||||
},
|
||||
|
||||
methods: {
|
||||
t,
|
||||
toggleVideo() {
|
||||
if (!this.isVideoAllowed || !this.isVideoAvailable) {
|
||||
emit('talk:media-settings:show')
|
||||
return
|
||||
}
|
||||
|
||||
if (this.model.attributes.videoEnabled) {
|
||||
this.model.disableVideo()
|
||||
} else {
|
||||
this.model.enableVideo()
|
||||
}
|
||||
},
|
||||
|
||||
handleVideoInputIdChange(videoInputId) {
|
||||
if (this.showDevices && this.showVideoOn) {
|
||||
// If input was changed from bottom bar while active, it should not be muted after track change
|
||||
this.resumeVideoAfterChange = true
|
||||
}
|
||||
this.videoInputId = videoInputId
|
||||
this.updatePreferences('videoinput')
|
||||
},
|
||||
|
||||
},
|
||||
}
|
||||
</script>
|
||||
|
||||
<style scoped lang="scss">
|
||||
.no-video-available {
|
||||
opacity: .7;
|
||||
}
|
||||
|
||||
.video-selector-button :deep(.action-item__menutoggle) {
|
||||
--button-size: var(--clickable-area-small);
|
||||
height: var(--default-clickable-area);
|
||||
border-start-start-radius: 2px;
|
||||
border-end-start-radius: 2px;
|
||||
}
|
||||
|
||||
.local-video-control-wrapper {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 1px;
|
||||
|
||||
// Overwriting NcButton styles
|
||||
.video-control-button {
|
||||
border-start-end-radius: 2px;
|
||||
border-end-end-radius: 2px;
|
||||
}
|
||||
}
|
||||
|
||||
.video-selector__action {
|
||||
// Overwriting NcActionButton styles
|
||||
:deep(.action-button__longtext) {
|
||||
display: -webkit-box;
|
||||
-webkit-line-clamp: 1;
|
||||
-webkit-box-orient: vertical;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
padding: 0;
|
||||
max-width: 350px;
|
||||
}
|
||||
|
||||
:deep(.action-button__longtext-wrapper) {
|
||||
max-width: 350px;
|
||||
}
|
||||
|
||||
:deep(.action-button__icon) {
|
||||
width: 0;
|
||||
margin-inline-start: calc(var(--default-grid-baseline) * 3);
|
||||
}
|
||||
|
||||
:deep(.action-button > span) {
|
||||
height: var(--default-clickable-area);
|
||||
}
|
||||
}
|
||||
</style>
|
||||
Reference in New Issue
Block a user