diff --git a/src/App.vue b/src/App.vue index ca4dd15057e..0a6ec847c7c 100644 --- a/src/App.vue +++ b/src/App.vue @@ -247,7 +247,7 @@ export default { window.addEventListener('beforeunload', this.preventUnload) }, - beforeDestroy() { + beforeUnmount() { this.debounceRefreshCurrentConversation.clear?.() if (!getCurrentUser()) { EventBus.off('should-refresh-conversations', this.debounceRefreshCurrentConversation) diff --git a/src/FilesSidebarCallViewApp.vue b/src/FilesSidebarCallViewApp.vue index d234049d4a3..6dc7662702d 100644 --- a/src/FilesSidebarCallViewApp.vue +++ b/src/FilesSidebarCallViewApp.vue @@ -147,7 +147,7 @@ export default { window.addEventListener('beforeunload', this.preventUnload) }, - beforeDestroy() { + beforeUnmount() { window.removeEventListener('beforeunload', this.preventUnload) }, diff --git a/src/PublicShareSidebar.vue b/src/PublicShareSidebar.vue index acd111a2476..319f48b2269 100644 --- a/src/PublicShareSidebar.vue +++ b/src/PublicShareSidebar.vue @@ -139,7 +139,7 @@ export default { }) }, - beforeDestroy() { + beforeUnmount() { window.removeEventListener('beforeunload', this.preventUnload) }, diff --git a/src/components/AdminSettings/AllowedGroups.vue b/src/components/AdminSettings/AllowedGroups.vue index 947e3f86acb..7acac5eeddf 100644 --- a/src/components/AdminSettings/AllowedGroups.vue +++ b/src/components/AdminSettings/AllowedGroups.vue @@ -162,7 +162,7 @@ export default { this.debounceSearchGroup('') }, - beforeDestroy() { + beforeUnmount() { this.debounceSearchGroup.clear?.() }, diff --git a/src/components/AdminSettings/Federation.vue b/src/components/AdminSettings/Federation.vue index 81a6fe34ea8..f754b703bb1 100644 --- a/src/components/AdminSettings/Federation.vue +++ b/src/components/AdminSettings/Federation.vue @@ -136,7 +136,7 @@ export default { this.debounceSearchGroup('') }, - beforeDestroy() { + beforeUnmount() { this.debounceSearchGroup.clear?.() }, diff --git a/src/components/AdminSettings/RecordingServers.vue b/src/components/AdminSettings/RecordingServers.vue index e211fb2a554..ccb7c008a67 100644 --- a/src/components/AdminSettings/RecordingServers.vue +++ b/src/components/AdminSettings/RecordingServers.vue @@ -149,7 +149,7 @@ export default { this.uploadLimit = parseInt(state.uploadLimit, 10) }, - beforeDestroy() { + beforeUnmount() { this.debounceUpdateServers.clear?.() }, diff --git a/src/components/AdminSettings/SIPBridge.vue b/src/components/AdminSettings/SIPBridge.vue index 4bf66016cc0..2022b5f966d 100644 --- a/src/components/AdminSettings/SIPBridge.vue +++ b/src/components/AdminSettings/SIPBridge.vue @@ -150,7 +150,7 @@ export default { this.isDialoutSupported() }, - beforeDestroy() { + beforeUnmount() { this.debounceSearchGroup.clear?.() }, diff --git a/src/components/AdminSettings/SignalingServers.vue b/src/components/AdminSettings/SignalingServers.vue index 0d99149fee6..4f4398eb192 100644 --- a/src/components/AdminSettings/SignalingServers.vue +++ b/src/components/AdminSettings/SignalingServers.vue @@ -118,7 +118,7 @@ export default { this.hideWarning = state.hideWarning }, - beforeDestroy() { + beforeUnmount() { this.debounceUpdateServers.clear?.() }, diff --git a/src/components/AdminSettings/StunServers.vue b/src/components/AdminSettings/StunServers.vue index 8d43b82775f..08c3b057574 100644 --- a/src/components/AdminSettings/StunServers.vue +++ b/src/components/AdminSettings/StunServers.vue @@ -78,7 +78,7 @@ export default { this.debounceUpdateServers = debounce(this.updateServers, 1000) }, - beforeDestroy() { + beforeUnmount() { this.debounceUpdateServers.clear?.() }, diff --git a/src/components/AdminSettings/TurnServer.vue b/src/components/AdminSettings/TurnServer.vue index add5c428fbd..d4fda2ec0a1 100644 --- a/src/components/AdminSettings/TurnServer.vue +++ b/src/components/AdminSettings/TurnServer.vue @@ -200,7 +200,7 @@ export default { this.testingSuccess = false }, - beforeDestroy() { + beforeUnmount() { this.debounceTestServer.clear?.() }, diff --git a/src/components/AdminSettings/TurnServers.vue b/src/components/AdminSettings/TurnServers.vue index a6380cb35cd..0a135808c99 100644 --- a/src/components/AdminSettings/TurnServers.vue +++ b/src/components/AdminSettings/TurnServers.vue @@ -89,7 +89,7 @@ export default { this.servers = loadState('spreed', 'turn_servers') }, - beforeDestroy() { + beforeUnmount() { this.debounceUpdateServers.clear?.() }, diff --git a/src/components/CallView/CallView.vue b/src/components/CallView/CallView.vue index cc0b747df87..facabadb0ac 100644 --- a/src/components/CallView/CallView.vue +++ b/src/components/CallView/CallView.vue @@ -429,7 +429,7 @@ export default { subscribe('set-background-blurred', this.setBackgroundBlurred) }, - beforeDestroy() { + beforeUnmount() { this.debounceFetchPeers.clear?.() this.$store.dispatch('isEmptyCallView', true) EventBus.off('refresh-peer-list', this.debounceFetchPeers) diff --git a/src/components/CallView/Grid/Grid.vue b/src/components/CallView/Grid/Grid.vue index 6019815cb80..ef289ea47c7 100644 --- a/src/components/CallView/Grid/Grid.vue +++ b/src/components/CallView/Grid/Grid.vue @@ -532,7 +532,7 @@ export default { window.OCA.Talk.gridDebugInformation = this.gridDebugInformation }, - beforeDestroy() { + beforeUnmount() { this.debounceMakeGrid.clear?.() window.OCA.Talk.gridDebugInformation = () => console.debug('Not in a call') diff --git a/src/components/CallView/shared/LocalAudioControlButton.vue b/src/components/CallView/shared/LocalAudioControlButton.vue index 55f93b6b28a..798c9109be2 100644 --- a/src/components/CallView/shared/LocalAudioControlButton.vue +++ b/src/components/CallView/shared/LocalAudioControlButton.vue @@ -131,7 +131,7 @@ export default { subscribe('local-audio-control-button:toggle-audio', this.updateDeviceState) }, - beforeDestroy() { + beforeUnmount() { unsubscribe('local-audio-control-button:toggle-audio', this.updateDeviceState) }, diff --git a/src/components/CallView/shared/LocalVideo.vue b/src/components/CallView/shared/LocalVideo.vue index 718d1f27dd4..99445309804 100644 --- a/src/components/CallView/shared/LocalVideo.vue +++ b/src/components/CallView/shared/LocalVideo.vue @@ -287,13 +287,13 @@ export default { } }, - beforeDestroy() { + beforeUnmount() { if (this.resizeObserver) { this.resizeObserver.disconnect() } }, - destroyed() { + unmounted() { if (this.notificationHandle) { this.notificationHandle.hideToast() } diff --git a/src/components/CallView/shared/LocalVideoControlButton.vue b/src/components/CallView/shared/LocalVideoControlButton.vue index 3c447bcb108..bf219ebfb6b 100644 --- a/src/components/CallView/shared/LocalVideoControlButton.vue +++ b/src/components/CallView/shared/LocalVideoControlButton.vue @@ -126,7 +126,7 @@ export default { subscribe('local-video-control-button:toggle-video', this.updateDeviceState) }, - beforeDestroy() { + beforeUnmount() { unsubscribe('local-video-control-button:toggle-video', this.updateDeviceState) }, diff --git a/src/components/CallView/shared/PresenterOverlay.vue b/src/components/CallView/shared/PresenterOverlay.vue index 8a8c08dd54e..2b537a98cbe 100644 --- a/src/components/CallView/shared/PresenterOverlay.vue +++ b/src/components/CallView/shared/PresenterOverlay.vue @@ -92,7 +92,7 @@ export default { window.addEventListener('resize', this.updateSize) }, - beforeDestroy() { + beforeUnmount() { window.removeEventListener('resize', this.updateSize) }, diff --git a/src/components/CallView/shared/ReactionToaster.vue b/src/components/CallView/shared/ReactionToaster.vue index 0b0a0eb9ce0..b116071eb1c 100644 --- a/src/components/CallView/shared/ReactionToaster.vue +++ b/src/components/CallView/shared/ReactionToaster.vue @@ -129,7 +129,7 @@ export default { subscribe('send-reaction', this.handleOwnReaction) }, - beforeDestroy() { + beforeUnmount() { clearInterval(this.intervalId) unsubscribe('send-reaction', this.handleOwnReaction) Object.keys(this.registeredModels).forEach(modelId => { diff --git a/src/components/CallView/shared/VideoVue.vue b/src/components/CallView/shared/VideoVue.vue index 2ca2fdb1499..2f12877e7e1 100644 --- a/src/components/CallView/shared/VideoVue.vue +++ b/src/components/CallView/shared/VideoVue.vue @@ -533,13 +533,13 @@ export default { } }, - beforeDestroy() { + beforeUnmount() { if (this.resizeObserver) { this.resizeObserver.disconnect() } }, - destroyed() { + unmounted() { this.sharedData.remoteVideoBlocker.decreaseVisibleCounter() }, diff --git a/src/components/CallView/shared/ViewerOverlayCallView.vue b/src/components/CallView/shared/ViewerOverlayCallView.vue index 723fc56b58a..dc767c1dee9 100644 --- a/src/components/CallView/shared/ViewerOverlayCallView.vue +++ b/src/components/CallView/shared/ViewerOverlayCallView.vue @@ -220,7 +220,7 @@ export default { this.observer.observe(this.$refs.ghost) }, - beforeDestroy() { + beforeUnmount() { this.observer.disconnect() }, diff --git a/src/components/ConversationSettings/ConversationSettingsDialog.vue b/src/components/ConversationSettings/ConversationSettingsDialog.vue index ff51ff32a08..ce8c93c7177 100644 --- a/src/components/ConversationSettings/ConversationSettingsDialog.vue +++ b/src/components/ConversationSettings/ConversationSettingsDialog.vue @@ -244,7 +244,7 @@ export default { }, - beforeDestroy() { + beforeUnmount() { unsubscribe('show-conversation-settings', this.handleShowSettings) unsubscribe('hide-conversation-settings', this.handleHideSettings) }, diff --git a/src/components/ConversationSettings/ListableSettings.vue b/src/components/ConversationSettings/ListableSettings.vue index aac44369d04..d098a27ec11 100644 --- a/src/components/ConversationSettings/ListableSettings.vue +++ b/src/components/ConversationSettings/ListableSettings.vue @@ -113,7 +113,7 @@ export default { } }, - beforeDestroy() { + beforeUnmount() { if (this.lastNotification) { this.lastNotification.hideToast() this.lastNotification = null diff --git a/src/components/ConversationSettings/Matterbridge/MatterbridgeSettings.vue b/src/components/ConversationSettings/Matterbridge/MatterbridgeSettings.vue index d12c7177931..17f511917c3 100644 --- a/src/components/ConversationSettings/Matterbridge/MatterbridgeSettings.vue +++ b/src/components/ConversationSettings/Matterbridge/MatterbridgeSettings.vue @@ -535,7 +535,7 @@ export default { beforeMount() { }, - beforeDestroy() { + beforeUnmount() { }, methods: { diff --git a/src/components/LeftSidebar/LeftSidebar.vue b/src/components/LeftSidebar/LeftSidebar.vue index f4890c59f28..dcb3ed17a6d 100644 --- a/src/components/LeftSidebar/LeftSidebar.vue +++ b/src/components/LeftSidebar/LeftSidebar.vue @@ -637,7 +637,7 @@ export default { this.handleFilter(BrowserStorage.getItem('filterEnabled')) }, - beforeDestroy() { + beforeUnmount() { this.debounceFetchSearchResults.clear?.() this.debounceFetchConversations.clear?.() this.debounceHandleScroll.clear?.() diff --git a/src/components/MediaSettings/MediaSettings.vue b/src/components/MediaSettings/MediaSettings.vue index 1bdc66477e6..1bbc8873beb 100644 --- a/src/components/MediaSettings/MediaSettings.vue +++ b/src/components/MediaSettings/MediaSettings.vue @@ -480,7 +480,7 @@ export default { } }, - beforeDestroy() { + beforeUnmount() { unsubscribe('talk:media-settings:show', this.showModal) unsubscribe('talk:media-settings:hide', this.closeModalAndApplySettings) }, diff --git a/src/components/MessagesList/MessagesGroup/Message/Message.vue b/src/components/MessagesList/MessagesGroup/Message/Message.vue index 0f76918cb08..172a77392e3 100644 --- a/src/components/MessagesList/MessagesGroup/Message/Message.vue +++ b/src/components/MessagesList/MessagesGroup/Message/Message.vue @@ -455,7 +455,7 @@ export default { EventBus.on('highlight-message', this.highlightMessage) }, - beforeDestroy() { + beforeUnmount() { EventBus.off('highlight-message', this.highlightMessage) }, diff --git a/src/components/MessagesList/MessagesGroup/Message/MessagePart/FilePreview.vue b/src/components/MessagesList/MessagesGroup/Message/MessagePart/FilePreview.vue index 895d3a7420e..77d9f6bc358 100644 --- a/src/components/MessagesList/MessagesGroup/Message/MessagePart/FilePreview.vue +++ b/src/components/MessagesList/MessagesGroup/Message/MessagePart/FilePreview.vue @@ -568,7 +568,7 @@ export default { img.src = this.previewUrl }, - beforeDestroy() { + beforeUnmount() { this.uploadManager = null }, diff --git a/src/components/MessagesList/MessagesList.vue b/src/components/MessagesList/MessagesList.vue index 2a65944dfc3..7129e08c4b2 100644 --- a/src/components/MessagesList/MessagesList.vue +++ b/src/components/MessagesList/MessagesList.vue @@ -308,7 +308,7 @@ export default { }, 30000) }, - beforeDestroy() { + beforeUnmount() { this.debounceUpdateReadMarkerPosition.clear?.() this.debounceHandleScroll.clear?.() diff --git a/src/components/NewConversationDialog/NewConversationContactsPage.vue b/src/components/NewConversationDialog/NewConversationContactsPage.vue index ad5c8336286..d5ef6a7a33c 100644 --- a/src/components/NewConversationDialog/NewConversationContactsPage.vue +++ b/src/components/NewConversationDialog/NewConversationContactsPage.vue @@ -170,7 +170,7 @@ export default { }) }, - beforeDestroy() { + beforeUnmount() { this.debounceFetchSearchResults.clear?.() this.cancelSearchPossibleConversations() diff --git a/src/components/NewMessage/NewMessage.vue b/src/components/NewMessage/NewMessage.vue index 9f4c57cf06c..b4e27baecf8 100644 --- a/src/components/NewMessage/NewMessage.vue +++ b/src/components/NewMessage/NewMessage.vue @@ -545,7 +545,7 @@ export default { } }, - beforeDestroy() { + beforeUnmount() { EventBus.off('focus-chat-input', this.focusInput) EventBus.off('upload-start', this.handleUploadSideEffects) EventBus.off('upload-discard', this.handleUploadSideEffects) diff --git a/src/components/NewMessage/NewMessageAudioRecorder.vue b/src/components/NewMessage/NewMessageAudioRecorder.vue index 4e97755895e..050ddb280d6 100644 --- a/src/components/NewMessage/NewMessageAudioRecorder.vue +++ b/src/components/NewMessage/NewMessageAudioRecorder.vue @@ -167,7 +167,7 @@ export default { this.$store.dispatch('initializeAudioEncoder') }, - beforeDestroy() { + beforeUnmount() { this.killStreams() }, diff --git a/src/components/PollViewer/PollViewer.vue b/src/components/PollViewer/PollViewer.vue index c8ffd850d23..1267c991525 100644 --- a/src/components/PollViewer/PollViewer.vue +++ b/src/components/PollViewer/PollViewer.vue @@ -258,7 +258,7 @@ export default { EventBus.on('talk:poll-added', this.showPollToast) }, - beforeDestroy() { + beforeUnmount() { EventBus.off('talk:poll-added', this.showPollToast) }, diff --git a/src/components/RightSidebar/BreakoutRooms/BreakoutRoomsTab.vue b/src/components/RightSidebar/BreakoutRooms/BreakoutRoomsTab.vue index 139878a87ae..a91b4f2a02f 100644 --- a/src/components/RightSidebar/BreakoutRooms/BreakoutRoomsTab.vue +++ b/src/components/RightSidebar/BreakoutRooms/BreakoutRoomsTab.vue @@ -139,7 +139,7 @@ export default { } }, - beforeDestroy() { + beforeUnmount() { // Clear the interval clearInterval(this.breakoutRoomsParticipantsInterval) }, diff --git a/src/components/RightSidebar/Participants/ParticipantsTab.vue b/src/components/RightSidebar/Participants/ParticipantsTab.vue index 217aa160418..46500125b2e 100644 --- a/src/components/RightSidebar/Participants/ParticipantsTab.vue +++ b/src/components/RightSidebar/Participants/ParticipantsTab.vue @@ -209,7 +209,7 @@ export default { subscribe('user_status:status.updated', this.updateUserStatus) }, - beforeDestroy() { + beforeUnmount() { this.debounceFetchSearchResults.clear?.() EventBus.off('route-change', this.abortSearch) diff --git a/src/components/RightSidebar/RightSidebar.vue b/src/components/RightSidebar/RightSidebar.vue index a972aaf6763..071fc3cfa56 100644 --- a/src/components/RightSidebar/RightSidebar.vue +++ b/src/components/RightSidebar/RightSidebar.vue @@ -351,7 +351,7 @@ export default { subscribe('spreed:select-active-sidebar-tab', this.handleUpdateActive) }, - beforeDestroy() { + beforeUnmount() { unsubscribe('spreed:select-active-sidebar-tab', this.handleUpdateActive) }, diff --git a/src/components/RightSidebar/SharedItems/SharedItemsBrowser.vue b/src/components/RightSidebar/SharedItems/SharedItemsBrowser.vue index 6725394ae9b..ed0a106a429 100644 --- a/src/components/RightSidebar/SharedItems/SharedItemsBrowser.vue +++ b/src/components/RightSidebar/SharedItems/SharedItemsBrowser.vue @@ -106,7 +106,7 @@ export default { this.firstFetchItems(this.activeTab) }, - beforeDestroy() { + beforeUnmount() { this.debounceHandleScroll.clear?.() }, diff --git a/src/components/SettingsDialog/SettingsDialog.vue b/src/components/SettingsDialog/SettingsDialog.vue index 8fa6a82dac9..0f92edf16bd 100644 --- a/src/components/SettingsDialog/SettingsDialog.vue +++ b/src/components/SettingsDialog/SettingsDialog.vue @@ -347,7 +347,7 @@ export default { this.showSettings = true }, - beforeDestroy() { + beforeUnmount() { unsubscribe('show-settings', this.handleShowSettings) }, }, diff --git a/src/components/TopBar/CallTime.vue b/src/components/TopBar/CallTime.vue index 1fbcbe60fb0..b5f5700577e 100644 --- a/src/components/TopBar/CallTime.vue +++ b/src/components/TopBar/CallTime.vue @@ -166,7 +166,7 @@ export default { this.timer = setInterval(this.computeElapsedTime, 1000) }, - beforeDestroy() { + beforeUnmount() { clearInterval(this.timer) }, diff --git a/src/components/TopBar/TopBar.vue b/src/components/TopBar/TopBar.vue index a89a7af0093..12b849b8b6f 100644 --- a/src/components/TopBar/TopBar.vue +++ b/src/components/TopBar/TopBar.vue @@ -340,7 +340,7 @@ export default { document.addEventListener('webkitfullscreenchange', this.fullScreenChanged, false) }, - beforeDestroy() { + beforeUnmount() { this.notifyUnreadMessages(null) document.removeEventListener('fullscreenchange', this.fullScreenChanged, false) document.removeEventListener('mozfullscreenchange', this.fullScreenChanged, false) diff --git a/src/components/TopBar/TopBarMediaControls.vue b/src/components/TopBar/TopBarMediaControls.vue index 319219bb5f7..babb78f807f 100644 --- a/src/components/TopBar/TopBarMediaControls.vue +++ b/src/components/TopBar/TopBarMediaControls.vue @@ -403,7 +403,7 @@ export default { this.speakingWhileMutedWarner = new SpeakingWhileMutedWarner(this.model, this) }, - beforeDestroy() { + beforeUnmount() { this.speakingWhileMutedWarner.destroy() },