🎨 fix #9163

siyuan-note · Sep 12, 2023 · 0073f70 · 0073f70
1 parent 38bb738
commit 0073f70
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 10 deletions.
diff --git a/app/src/config/about.ts b/app/src/config/about.ts
@@ -148,10 +148,6 @@ export const about = {
         <button id="checkUpdateBtn" class="b3-button b3-button--outline fn__block">
             <svg><use xlink:href="#iconRefresh"></use></svg>${window.siyuan.languages.checkUpdate}
         </button>
-        <div class="fn__hr${(isInIOS() || isInAndroid()) ? "" : " fn__none"}"></div>
-        <button id="menuSafeQuit" class="b3-button b3-button--outline fn__block${(isInIOS() || isInAndroid()) ? "" : " fn__none"}">
-            <svg><use xlink:href="#iconQuit"></use></svg>${window.siyuan.languages.safeQuit}
-        </button>
     </div>
 </label>
 <label class="fn__flex config__item  b3-label">
@@ -208,9 +204,6 @@ export const about = {
                 openByMobile(response.data.zip);
             });
         });
-        about.element.querySelector("#menuSafeQuit").addEventListener("click", () => {
-            exitSiYuan();
-        });
         const updateElement = about.element.querySelector("#checkUpdateBtn");
         updateElement.addEventListener("click", () => {
             if (updateElement.firstElementChild.classList.contains("fn__rotate")) {

diff --git a/app/src/layout/topBar.ts b/app/src/layout/topBar.ts
@@ -1,10 +1,9 @@
 import {getWorkspaceName} from "../util/noRelyPCFunction";
-import {isHuawei, setStorageVal, updateHotkeyTip} from "../protyle/util/compatibility";
-import {processSync} from "../dialog/processSystem";
+import {isHuawei, isInAndroid, isInIOS, setStorageVal, updateHotkeyTip} from "../protyle/util/compatibility";
+import {exitSiYuan, processSync} from "../dialog/processSystem";
 import {goBack, goForward} from "../util/backForward";
 import {syncGuide} from "../sync/syncGuide";
 import {workspaceMenu} from "../menus/workspace";
-import {editor} from "../config/editor";
 import {MenuItem} from "../menus/Menu";
 import {setMode} from "../util/assets";
 import {openSetting} from "../config";
@@ -51,6 +50,9 @@ export const initBar = (app: App) => {
 <div id="barMode" class="toolbar__item b3-tooltips b3-tooltips__sw${window.siyuan.config.readonly ? " fn__none" : ""}" aria-label="${window.siyuan.languages.appearanceMode}">
     <svg><use xlink:href="#icon${window.siyuan.config.appearance.modeOS ? "Mode" : (window.siyuan.config.appearance.mode === 0 ? "Light" : "Dark")}"></use></svg>
 </div>
+<div id="barExit" class="toolbar__item b3-tooltips b3-tooltips__sw${(isInIOS() || isInAndroid()) ? "" : " fn__none"}" aria-label="${window.siyuan.languages.safeQuit}">
+    <svg><use xlink:href="#iconQuit"></use></svg>
+</div>
 <div id="barMore" class="toolbar__item">
     <svg><use xlink:href="#iconMore"></use></svg>
 </div>
@@ -112,6 +114,10 @@ export const initBar = (app: App) => {
                 workspaceMenu(app, target.getBoundingClientRect());
                 event.stopPropagation();
                 break;
+            } else if (targetId === "barExit") {
+                exitSiYuan();
+                event.stopPropagation();
+                break;
             } else if (targetId === "barMode") {
                 if (!window.siyuan.menus.menu.element.classList.contains("fn__none") &&
                     window.siyuan.menus.menu.element.getAttribute("data-name") === "barmode") {