From 16993ce31ecbfd2df1b7e82acfc28bba5e568a41 Mon Sep 17 00:00:00 2001 From: Dominik Schmidt Date: Thu, 13 Oct 2022 16:12:34 +0200 Subject: [PATCH] fixup! Announce document title changes handled by apps --- .../web-app-files/src/views/spaces/GenericSpace.vue | 2 +- .../web-app-files/src/views/spaces/GenericTrash.vue | 2 +- .../src/composables/appDefaults/useAppDocumentTitle.ts | 1 - .../src/composables/appDefaults/useDocumentTitle.ts | 10 ++-------- packages/web-pkg/src/composables/eventBus/index.ts | 1 + 5 files changed, 5 insertions(+), 11 deletions(-) diff --git a/packages/web-app-files/src/views/spaces/GenericSpace.vue b/packages/web-app-files/src/views/spaces/GenericSpace.vue index eeeee410487..e2e721f3d1f 100644 --- a/packages/web-app-files/src/views/spaces/GenericSpace.vue +++ b/packages/web-app-files/src/views/spaces/GenericSpace.vue @@ -200,7 +200,7 @@ export default defineComponent({ return segments }) - useDocumentTitle({ document, titleSegments }) + useDocumentTitle({ titleSegments }) const { $gettext } = useTranslations() const route = useRoute() diff --git a/packages/web-app-files/src/views/spaces/GenericTrash.vue b/packages/web-app-files/src/views/spaces/GenericTrash.vue index 70cb73aea19..0624ce19b15 100644 --- a/packages/web-app-files/src/views/spaces/GenericTrash.vue +++ b/packages/web-app-files/src/views/spaces/GenericTrash.vue @@ -130,7 +130,7 @@ export default defineComponent({ } return segments }) - useDocumentTitle({ document, titleSegments }) + useDocumentTitle({ titleSegments }) return { ...useResourcesViewDefaults(), diff --git a/packages/web-pkg/src/composables/appDefaults/useAppDocumentTitle.ts b/packages/web-pkg/src/composables/appDefaults/useAppDocumentTitle.ts index d2aba4249c3..5f7e71d05f7 100644 --- a/packages/web-pkg/src/composables/appDefaults/useAppDocumentTitle.ts +++ b/packages/web-pkg/src/composables/appDefaults/useAppDocumentTitle.ts @@ -31,7 +31,6 @@ export function useAppDocumentTitle({ }) useDocumentTitle({ - document, titleSegments }) } diff --git a/packages/web-pkg/src/composables/appDefaults/useDocumentTitle.ts b/packages/web-pkg/src/composables/appDefaults/useDocumentTitle.ts index 464f32d54c4..bb5695f8288 100755 --- a/packages/web-pkg/src/composables/appDefaults/useDocumentTitle.ts +++ b/packages/web-pkg/src/composables/appDefaults/useDocumentTitle.ts @@ -1,22 +1,16 @@ import { watch, Ref, unref } from '@vue/composition-api' import { useStore } from '../store' import { Store } from 'vuex' -import { useEventBus } from '../eventBus/useEventBus' +import { useEventBus } from '../eventBus' import { EventBus } from '../../services' interface DocumentTitleOptions { - document: Document titleSegments: Ref store?: Store eventBus?: EventBus } -export function useDocumentTitle({ - document, - titleSegments, - store, - eventBus -}: DocumentTitleOptions): void { +export function useDocumentTitle({ titleSegments, store, eventBus }: DocumentTitleOptions): void { store = store || useStore() eventBus = eventBus || useEventBus() diff --git a/packages/web-pkg/src/composables/eventBus/index.ts b/packages/web-pkg/src/composables/eventBus/index.ts index e69de29bb2d..dbad76fb367 100644 --- a/packages/web-pkg/src/composables/eventBus/index.ts +++ b/packages/web-pkg/src/composables/eventBus/index.ts @@ -0,0 +1 @@ +export * from './useEventBus'