Skip to content

Commit

Permalink
Merge pull request #10246 from nextcloud/backport/10212/stable27
Browse files Browse the repository at this point in the history
[stable27] Fix recording buttons conditioned appearing
  • Loading branch information
Antreesy committed Aug 17, 2023
2 parents 0c4f1c2 + 238a807 commit 1b58a5e
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions src/components/TopBar/CallTime.vue
Expand Up @@ -22,7 +22,7 @@
<NcPopover class="call-time"
:menu-title="callTime"
:shown.sync="showPopover"
:focus-trap="isShowRecordingStatus"
:focus-trap="isShowRecordingControls"
:triggers="[]"
:container="container">
<template #trigger>
Expand All @@ -31,7 +31,7 @@
:title="recordingButtonTitle"
type="tertiary"
@click="showPopover = !showPopover">
<template v-if="isShowRecordingStatus" #icon>
<template v-if="isRecording || isStartingRecording" #icon>
<RecordCircle v-if="isRecording"
:size="20"
fill-color="#e9322d" />
Expand All @@ -49,7 +49,7 @@
</span>

<!--Moderator's buttons-->
<template v-if="isShowRecordingStatus">
<template v-if="isShowRecordingControls">
<hr v-if="isCallDurationHintShown" class="solid">
<NcButton v-if="isStartingRecording"
type="tertiary-no-background"
Expand Down Expand Up @@ -150,12 +150,12 @@ export default {
|| this.conversation.callRecording === CALL.RECORDING.AUDIO
},
isShowRecordingStatus() {
return this.isStartingRecording || this.isRecording
isShowRecordingControls() {
return this.isModerator && (this.isStartingRecording || this.isRecording)
},
isButtonDisabled() {
return !this.isShowRecordingStatus && !this.isCallDurationHintShown
return !this.isShowRecordingControls && !this.isCallDurationHintShown
},
recordingButtonTitle() {
Expand Down

0 comments on commit 1b58a5e

Please sign in to comment.