github/siyuan
4
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-05-15 16:41:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

🎨 fix https://github.com/siyuan-note/siyuan/issues/9163

Browse Source
This commit is contained in:
Vanessa 2023-09-12 10:20:03 +08:00
parent 38bb73810b
commit 0073f708be
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/config/about.ts
View File

@ -148,10 +148,6 @@ export const about = {
<button id="checkUpdateBtn" class="b3-button b3-button--outline fn__block"> <button id="checkUpdateBtn" class="b3-button b3-button--outline fn__block">
<svg><use xlink:href="#iconRefresh"></use></svg>${window.siyuan.languages.checkUpdate} <svg><use xlink:href="#iconRefresh"></use></svg>${window.siyuan.languages.checkUpdate}
</button> </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> </div>
</label> </label>
<label class="fn__flex config__item b3-label"> <label class="fn__flex config__item b3-label">
@ -208,9 +204,6 @@ export const about = {
openByMobile(response.data.zip); openByMobile(response.data.zip);
}); });
}); });
about.element.querySelector("#menuSafeQuit").addEventListener("click", () => {
exitSiYuan();
});
const updateElement = about.element.querySelector("#checkUpdateBtn"); const updateElement = about.element.querySelector("#checkUpdateBtn");
updateElement.addEventListener("click", () => { updateElement.addEventListener("click", () => {
if (updateElement.firstElementChild.classList.contains("fn__rotate")) { if (updateElement.firstElementChild.classList.contains("fn__rotate")) {

12
app/src/layout/topBar.ts
View File

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