From a29e642e83587d3e8ab81f4215d1f880c7757ba7 Mon Sep 17 00:00:00 2001 From: Vanessa Date: Wed, 31 Aug 2022 20:22:09 +0800 Subject: [PATCH] :bug: fix https://github.com/siyuan-note/siyuan/issues/5774 --- app/src/menus/commonMenuItem.ts | 14 +++++++------- app/src/menus/protyle.ts | 8 ++++---- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/app/src/menus/commonMenuItem.ts b/app/src/menus/commonMenuItem.ts index 89c2265c4..12b5688bd 100644 --- a/app/src/menus/commonMenuItem.ts +++ b/app/src/menus/commonMenuItem.ts @@ -697,7 +697,7 @@ export const exportMd = (id: string) => { }).element; }; -export const openMenu = (src: string, onlyMenu = false) => { +export const openMenu = (src: string, onlyMenu: boolean, showAccelerator: boolean) => { const submenu = []; if (isLocalPath(src)) { if (Constants.SIYUAN_ASSETS_EXTS.includes(pathPosix().extname(src)) && @@ -707,7 +707,7 @@ export const openMenu = (src: string, onlyMenu = false) => { /// #if !MOBILE submenu.push({ label: window.siyuan.languages.insertRight, - accelerator: "Click", + accelerator: showAccelerator ? "Click" : "", click() { openAsset(src.trim(), parseInt(getSearch("page", src)), "right"); } @@ -716,7 +716,7 @@ export const openMenu = (src: string, onlyMenu = false) => { /// #if !BROWSER submenu.push({ label: window.siyuan.languages.useDefault, - accelerator: "⇧Click", + accelerator: showAccelerator ? "⇧Click" : "", click() { openBy(src, "app"); } @@ -726,7 +726,7 @@ export const openMenu = (src: string, onlyMenu = false) => { /// #if !BROWSER submenu.push({ label: window.siyuan.languages.useDefault, - accelerator: "Click", + accelerator: showAccelerator ? "Click" : "", click() { openBy(src, "app"); } @@ -736,7 +736,7 @@ export const openMenu = (src: string, onlyMenu = false) => { /// #if !BROWSER submenu.push({ label: window.siyuan.languages.showInFolder, - accelerator: "⌘Click", + accelerator: showAccelerator ? "⌘Click" : "", click: () => { openBy(src, "folder"); } @@ -746,7 +746,7 @@ export const openMenu = (src: string, onlyMenu = false) => { /// #if !BROWSER submenu.push({ label: window.siyuan.languages.useDefault, - accelerator: "Click", + accelerator: showAccelerator ? "Click" : "", click: () => { shell.openExternal(src).catch((e) => { showMessage(e); @@ -758,7 +758,7 @@ export const openMenu = (src: string, onlyMenu = false) => { /// #if BROWSER submenu.push({ label: window.siyuan.languages.useBrowserView, - accelerator: "Click", + accelerator: showAccelerator ? "Click" : "", click: () => { openByMobile(src); } diff --git a/app/src/menus/protyle.ts b/app/src/menus/protyle.ts index 6a5003555..e8eba14cc 100644 --- a/app/src/menus/protyle.ts +++ b/app/src/menus/protyle.ts @@ -641,7 +641,7 @@ export const imgMenu = (protyle: IProtyle, range: Range, assetElement: HTMLEleme const imgSrc = imgElement.getAttribute("src"); if (imgSrc) { window.siyuan.menus.menu.append(new MenuItem({type: "separator"}).element); - openMenu(imgSrc); + openMenu(imgSrc, false, false); } window.siyuan.menus.menu.popup({x: position.clientX, y: position.clientY}); window.siyuan.menus.menu.element.querySelector("input").focus(); @@ -772,7 +772,7 @@ export const linkMenu = (protyle: IProtyle, linkElement: HTMLElement, focusText } }).element); if (linkAddress) { - openMenu(linkAddress); + openMenu(linkAddress, false, true); } if (linkAddress?.startsWith("siyuan://blocks/")) { window.siyuan.menus.menu.append(new MenuItem({ @@ -905,7 +905,7 @@ export const iframeMenu = (protyle: IProtyle, nodeElement: Element) => { subMenus.push({ type: "separator" }); - return subMenus.concat(openMenu(iframeSrc, true) as IMenu[]); + return subMenus.concat(openMenu(iframeSrc, true, false) as IMenu[]); } return subMenus; }; @@ -943,7 +943,7 @@ export const videoMenu = (protyle: IProtyle, nodeElement: Element, type: string) /// #endif const VideoSrc = videoElement.getAttribute("src"); if (VideoSrc) { - return subMenus.concat(openMenu(VideoSrc, true) as IMenu[]); + return subMenus.concat(openMenu(VideoSrc, true, false) as IMenu[]); } return subMenus; };