From a306fb4845fd68bee18532adcb3b0c11477a27b5 Mon Sep 17 00:00:00 2001 From: Vanessa Date: Wed, 21 Sep 2022 19:53:52 +0800 Subject: [PATCH] =?UTF-8?q?:art:=20https://github.com/siyuan-note/siyuan/i?= =?UTF-8?q?ssues/5908=20=E8=B0=83=E6=95=B4=E5=85=B3=E9=97=AD=E8=8F=9C?= =?UTF-8?q?=E5=8D=95=E9=A1=BA=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/menus/tab.ts | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/app/src/menus/tab.ts b/app/src/menus/tab.ts index b290709ad..0352e1ce4 100644 --- a/app/src/menus/tab.ts +++ b/app/src/menus/tab.ts @@ -61,6 +61,23 @@ const closeMenu = (tab: Tab) => { } } }).element); + if (unmodifiedTabs.length > 0) { + window.siyuan.menus.menu.append(new MenuItem({ + label: window.siyuan.languages.closeUnmodified, + click: async () => { + for (let index = 0; index < unmodifiedTabs.length; index++) { + if (!unmodifiedTabs[index].headElement.classList.contains("item--pin")) { + await unmodifiedTabs[index].parent.removeTab(unmodifiedTabs[index].id); + } + } + if (tab.headElement.parentElement && !tab.headElement.parentElement.querySelector(".item--focus")) { + tab.parent.switchTab(tab.headElement, true); + } else if (allTabs[0].headElement.parentElement) { + allTabs[0].parent.switchTab(allTabs[0].headElement, true); + } + } + }).element); + } if (leftTabs.length > 0) { window.siyuan.menus.menu.append(new MenuItem({ label: window.siyuan.languages.closeLeft, @@ -91,23 +108,6 @@ const closeMenu = (tab: Tab) => { } }).element); } - if (unmodifiedTabs.length > 0) { - window.siyuan.menus.menu.append(new MenuItem({ - label: window.siyuan.languages.closeUnmodified, - click: async () => { - for (let index = 0; index < unmodifiedTabs.length; index++) { - if (!unmodifiedTabs[index].headElement.classList.contains("item--pin")) { - await unmodifiedTabs[index].parent.removeTab(unmodifiedTabs[index].id); - } - } - if (tab.headElement.parentElement && !tab.headElement.parentElement.querySelector(".item--focus")) { - tab.parent.switchTab(tab.headElement, true); - } else if (allTabs[0].headElement.parentElement) { - allTabs[0].parent.switchTab(allTabs[0].headElement, true); - } - } - }).element); - } } window.siyuan.menus.menu.append(new MenuItem({type: "separator"}).element); };