diff options
author | Maksim Sukharev <antreesy.web@gmail.com> | 2023-04-14 10:44:29 +0200 |
---|---|---|
committer | Maksim Sukharev <antreesy.web@gmail.com> | 2023-04-14 10:44:29 +0200 |
commit | 788ec820eb612b706d5b70b8c70b2494730dcfb5 (patch) | |
tree | 68f4545e0b6f8593c1ce314d66ded45260c80080 | |
parent | 3f95565f25c5e08f166f09867cf0ecc50bd8e4a8 (diff) |
add to all NcActions missing container props
Signed-off-by: Maksim Sukharev <antreesy.web@gmail.com>
7 files changed, 28 insertions, 4 deletions
diff --git a/src/components/BreakoutRoomsEditor/BreakoutRoomsParticipantsEditor.vue b/src/components/BreakoutRoomsEditor/BreakoutRoomsParticipantsEditor.vue index b08f485f4..690f98912 100644 --- a/src/components/BreakoutRoomsEditor/BreakoutRoomsParticipantsEditor.vue +++ b/src/components/BreakoutRoomsEditor/BreakoutRoomsParticipantsEditor.vue @@ -70,6 +70,7 @@ </NcButton> <NcActions v-if="hasSelected" type="primary" + :container="container" :menu-title="t('spreed', 'Assign')"> <NcActionButton v-for="(item, index) in assignments" :key="index" @@ -145,6 +146,10 @@ export default { }, computed: { + container() { + return this.$store.getters.getMainContainerSelector() + }, + participants() { return this.$store.getters.participantsList(this.token).filter(participant => { return (participant.participantType === PARTICIPANT.TYPE.USER diff --git a/src/components/ConversationSettings/Matterbridge/BridgePart.vue b/src/components/ConversationSettings/Matterbridge/BridgePart.vue index c0fb1581d..a86184b18 100644 --- a/src/components/ConversationSettings/Matterbridge/BridgePart.vue +++ b/src/components/ConversationSettings/Matterbridge/BridgePart.vue @@ -28,7 +28,8 @@ <span> {{ type.name }} </span> - <NcActions :force-menu="false"> + <NcActions :container="container" + :force-menu="false"> <NcActionButton v-if="editable" :icon="editing ? 'icon-checkmark' : 'icon-rename'" @click="onEditClick"> @@ -36,6 +37,7 @@ </NcActionButton> </NcActions> <NcActions class="actions" + :container="container" :force-menu="true" placement="bottom"> <NcActionLink icon="icon-info" @@ -116,6 +118,10 @@ export default { type: Object, required: true, }, + container: { + type: String, + required: true, + }, editing: { type: Boolean, default: false, diff --git a/src/components/ConversationSettings/Matterbridge/MatterbridgeSettings.vue b/src/components/ConversationSettings/Matterbridge/MatterbridgeSettings.vue index f6cd01e64..9083bf199 100644 --- a/src/components/ConversationSettings/Matterbridge/MatterbridgeSettings.vue +++ b/src/components/ConversationSettings/Matterbridge/MatterbridgeSettings.vue @@ -86,6 +86,7 @@ :type="types[part.type]" :editing="part.editing" :editable="!enabled" + :container="container" @edit-clicked="onEditClicked(i)" @delete-part="onDelete(i)" /> </li> diff --git a/src/components/NewMessageForm/NewMessageForm.vue b/src/components/NewMessageForm/NewMessageForm.vue index ee4bb8ef1..8322c5692 100644 --- a/src/components/NewMessageForm/NewMessageForm.vue +++ b/src/components/NewMessageForm/NewMessageForm.vue @@ -137,6 +137,7 @@ <!-- Send buttons --> <template v-else> <NcActions v-if="!broadcast" + :container="container" :force-menu="true"> <!-- Silent send --> <NcActionButton :close-after-click="true" diff --git a/src/components/RightSidebar/BreakoutRooms/BreakoutRoomItem.vue b/src/components/RightSidebar/BreakoutRooms/BreakoutRoomItem.vue index 5b903a967..d88291283 100644 --- a/src/components/RightSidebar/BreakoutRooms/BreakoutRoomItem.vue +++ b/src/components/RightSidebar/BreakoutRooms/BreakoutRoomItem.vue @@ -44,7 +44,9 @@ <NcButton v-if="showJoinButton" @click="joinRoom"> {{ t('spreed', 'Join') }} </NcButton> - <NcActions v-if="canModerate" :force-menu="true"> + <NcActions v-if="canModerate" + :container="container" + :force-menu="true"> <NcActionButton v-if="showAssistanceButton" @click="dismissRequestAssistance"> <template #icon> @@ -144,6 +146,10 @@ export default { }, computed: { + container() { + return this.$store.getters.getMainContainerSelector() + }, + participantType() { return this.breakoutRoom.participantType }, diff --git a/src/components/RightSidebar/BreakoutRooms/BreakoutRoomsActions.vue b/src/components/RightSidebar/BreakoutRooms/BreakoutRoomsActions.vue index 76ea85e67..69de7ef15 100644 --- a/src/components/RightSidebar/BreakoutRooms/BreakoutRoomsActions.vue +++ b/src/components/RightSidebar/BreakoutRooms/BreakoutRoomsActions.vue @@ -61,7 +61,9 @@ </template> {{ backToBreakoutRoomLabel }} </NcButton> - <NcActions v-if="canModerate" class="right"> + <NcActions v-if="canModerate" + class="right" + :container="container"> <NcActionButton v-if="canModerate && isInBreakoutRoom" :title="sendMessageLabel" :aria-label="sendMessageLabel" diff --git a/src/components/TopBar/CallButton.vue b/src/components/TopBar/CallButton.vue index 14bf09d17..3a30ba8c6 100644 --- a/src/components/TopBar/CallButton.vue +++ b/src/components/TopBar/CallButton.vue @@ -51,6 +51,7 @@ <NcActions v-else-if="showLeaveCallButton && (canEndForAll || isBreakoutRoom)" :disabled="loading" :menu-title="leaveCallCombinedLabel" + :container="container" type="error"> <template #icon> <VideoOff v-if="!isBreakoutRoom" :size="20" /> @@ -159,7 +160,9 @@ export default { isNextcloudTalkHashDirty() { return this.$store.getters.isNextcloudTalkHashDirty }, - + container() { + return this.$store.getters.getMainContainerSelector() + }, conversation() { return this.$store.getters.conversation(this.token) || this.$store.getters.dummyConversation }, |