From 079cf6042569fb67b772e6708a07aa3b9902e102 Mon Sep 17 00:00:00 2001 From: ian Date: Wed, 9 Mar 2022 01:06:14 +0800 Subject: [PATCH] Close WYSIWYG fullscreen when opening drawer or dialog (#12037) --- app/src/interfaces/input-rich-text-html/useImage.ts | 4 ++++ app/src/interfaces/input-rich-text-html/useLink.ts | 4 ++++ app/src/interfaces/input-rich-text-html/useMedia.ts | 4 ++++ app/src/interfaces/input-rich-text-html/useSourceCode.ts | 4 ++++ 4 files changed, 16 insertions(+) diff --git a/app/src/interfaces/input-rich-text-html/useImage.ts b/app/src/interfaces/input-rich-text-html/useImage.ts index 9be2386ec4..5b6ad16b16 100644 --- a/app/src/interfaces/input-rich-text-html/useImage.ts +++ b/app/src/interfaces/input-rich-text-html/useImage.ts @@ -36,6 +36,10 @@ export default function useImage(editor: Ref, imageToken: Ref { + if (editor.value.plugins.fullscreen.isFullscreen()) { + editor.value.execCommand('mceFullScreen'); + } + imageDrawerOpen.value = true; if (buttonApi.isActive()) { diff --git a/app/src/interfaces/input-rich-text-html/useLink.ts b/app/src/interfaces/input-rich-text-html/useLink.ts index 596e28caea..ba19d2e479 100644 --- a/app/src/interfaces/input-rich-text-html/useLink.ts +++ b/app/src/interfaces/input-rich-text-html/useLink.ts @@ -37,6 +37,10 @@ export default function useLink(editor: Ref): UsableLink { icon: 'link', tooltip: i18n.global.t('wysiwyg_options.link'), onAction: (buttonApi: any) => { + if (editor.value.plugins.fullscreen.isFullscreen()) { + editor.value.execCommand('mceFullScreen'); + } + linkDrawerOpen.value = true; if (buttonApi.isActive()) { diff --git a/app/src/interfaces/input-rich-text-html/useMedia.ts b/app/src/interfaces/input-rich-text-html/useMedia.ts index 4db05d9b01..085579e927 100644 --- a/app/src/interfaces/input-rich-text-html/useMedia.ts +++ b/app/src/interfaces/input-rich-text-html/useMedia.ts @@ -45,6 +45,10 @@ export default function useMedia(editor: Ref, imageToken: Ref { + if (editor.value.plugins.fullscreen.isFullscreen()) { + editor.value.execCommand('mceFullScreen'); + } + mediaDrawerOpen.value = true; if (buttonApi.isActive()) { diff --git a/app/src/interfaces/input-rich-text-html/useSourceCode.ts b/app/src/interfaces/input-rich-text-html/useSourceCode.ts index b65f4cf7e6..7070ee276e 100644 --- a/app/src/interfaces/input-rich-text-html/useSourceCode.ts +++ b/app/src/interfaces/input-rich-text-html/useSourceCode.ts @@ -23,6 +23,10 @@ export default function useSourceCode(editor: Ref): UsableSourceCode { icon: 'sourcecode', tooltip: i18n.global.t('wysiwyg_options.source_code'), onAction: () => { + if (editor.value.plugins.fullscreen.isFullscreen()) { + editor.value.execCommand('mceFullScreen'); + } + codeDrawerOpen.value = true; code.value = editor.value.getContent(); },