Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-12-23 10:00:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

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

Browse source
This commit is contained in:
Vanessa 2024-05-22 17:36:11 +08:00
parent a178e864aa
commit 4854879af3
5 changed files with 26 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

18
app/src/layout/status.ts
View file

@ -10,7 +10,7 @@ import { ipcRenderer } from "electron";
import {MenuItem} from "../menus/Menu"; import {MenuItem} from "../menus/Menu";
import {Constants} from "../constants"; import {Constants} from "../constants";
import {toggleDockBar} from "./dock/util"; import {toggleDockBar} from "./dock/util";
import {updateHotkeyTip} from "../protyle/util/compatibility"; import {isIPad, updateHotkeyTip} from "../protyle/util/compatibility";
export const initStatus = (isWindow = false) => { export const initStatus = (isWindow = false) => {
/// #if !MOBILE /// #if !MOBILE
@ -64,13 +64,15 @@ export const initStatus = (isWindow = false) => {
} }
window.siyuan.menus.menu.remove(); window.siyuan.menus.menu.remove();
window.siyuan.menus.menu.element.setAttribute("data-name", "statusHelp"); window.siyuan.menus.menu.element.setAttribute("data-name", "statusHelp");
window.siyuan.menus.menu.append(new MenuItem({ if (!isIPad()) {
label: window.siyuan.languages.userGuide, window.siyuan.menus.menu.append(new MenuItem({
icon: "iconHelp", label: window.siyuan.languages.userGuide,
click: () => { icon: "iconHelp",
mountHelp(); click: () => {
} mountHelp();
}).element); }
}).element);
}
window.siyuan.menus.menu.append(new MenuItem({ window.siyuan.menus.menu.append(new MenuItem({
label: window.siyuan.languages.feedback, label: window.siyuan.languages.feedback,
icon: "iconFeedback", icon: "iconFeedback",

4
app/src/layout/tabUtil.ts
View file

@ -16,7 +16,7 @@ import {Tag} from "./dock/Tag";
import {Search} from "../search"; import {Search} from "../search";
import {Custom} from "./dock/Custom"; import {Custom} from "./dock/Custom";
import {newCardModel} from "../card/newCardTab"; import {newCardModel} from "../card/newCardTab";
import {updateHotkeyTip} from "../protyle/util/compatibility"; import {isIPad, updateHotkeyTip} from "../protyle/util/compatibility";
import {openSearch} from "../search/spread"; import {openSearch} from "../search/spread";
import {openRecentDocs} from "../business/openRecentDocs"; import {openRecentDocs} from "../business/openRecentDocs";
import {openHistory} from "../history/history"; import {openHistory} from "../history/history";
@ -192,7 +192,7 @@ export const newCenterEmptyTab = (app: App) => {
<svg class="b3-list-item__graphic"><use xlink:href="#iconFilesRoot"></use></svg> <svg class="b3-list-item__graphic"><use xlink:href="#iconFilesRoot"></use></svg>
<span>${window.siyuan.languages.newNotebook}</span> <span>${window.siyuan.languages.newNotebook}</span>
</div> </div>
<div class="b3-list-item" id="editorEmptyHelp"> <div class="b3-list-item${isIPad() ? "fn__none" : ""}" id="editorEmptyHelp">
<svg class="b3-list-item__graphic"><use xlink:href="#iconHelp"></use></svg> <svg class="b3-list-item__graphic"><use xlink:href="#iconHelp"></use></svg>
<span>${window.siyuan.languages.userGuide}</span> <span>${window.siyuan.languages.userGuide}</span>
</div> </div>

16
app/src/menus/workspace.ts
View file

@ -432,13 +432,15 @@ export const workspaceMenu = (app: App, rect: DOMRect) => {
}).element); }).element);
window.siyuan.menus.menu.append(new MenuItem({type: "separator"}).element); window.siyuan.menus.menu.append(new MenuItem({type: "separator"}).element);
} }
window.siyuan.menus.menu.append(new MenuItem({ if (!isIPad()) {
label: window.siyuan.languages.userGuide, window.siyuan.menus.menu.append(new MenuItem({
icon: "iconHelp", label: window.siyuan.languages.userGuide,
click: () => { icon: "iconHelp",
mountHelp(); click: () => {
} mountHelp();
}).element); }
}).element);
}
window.siyuan.menus.menu.append(new MenuItem({ window.siyuan.menus.menu.append(new MenuItem({
label: window.siyuan.languages.feedback, label: window.siyuan.languages.feedback,
icon: "iconFeedback", icon: "iconFeedback",

4
app/src/mobile/menu/index.ts
View file

@ -16,7 +16,7 @@ import {initAbout} from "../settings/about";
import {getRecentDocs} from "./getRecentDocs"; import {getRecentDocs} from "./getRecentDocs";
import {initEditor} from "../settings/editor"; import {initEditor} from "../settings/editor";
import {App} from "../../index"; import {App} from "../../index";
import {isHuawei, isInAndroid, isInIOS} from "../../protyle/util/compatibility"; import {isHuawei, isInAndroid, isInIOS, isIPhone} from "../../protyle/util/compatibility";
import {newFile} from "../../util/newFile"; import {newFile} from "../../util/newFile";
import {afterLoadPlugin} from "../../plugin/loader"; import {afterLoadPlugin} from "../../plugin/loader";
import {Menu} from "../../plugin/Menu"; import {Menu} from "../../plugin/Menu";
@ -112,7 +112,7 @@ export const initRightMenu = (app: App) => {
<svg class="b3-menu__icon"><use xlink:href="#iconPlugin"></use></svg><span class="b3-menu__label">${window.siyuan.languages.plugin}</span> <svg class="b3-menu__icon"><use xlink:href="#iconPlugin"></use></svg><span class="b3-menu__label">${window.siyuan.languages.plugin}</span>
</div> </div>
<div class="b3-menu__separator"></div> <div class="b3-menu__separator"></div>
<div class="b3-menu__item" id="menuHelp"> <div class="b3-menu__item${isIPhone() ? "fn__none" : ""}" id="menuHelp">
<svg class="b3-menu__icon"><use xlink:href="#iconHelp"></use></svg><span class="b3-menu__label">${window.siyuan.languages.userGuide}</span> <svg class="b3-menu__icon"><use xlink:href="#iconHelp"></use></svg><span class="b3-menu__label">${window.siyuan.languages.userGuide}</span>
</div> </div>
<a class="b3-menu__item" href="${"zh_CN" === window.siyuan.config.lang || "zh_CHT" === window.siyuan.config.lang ? "https://ld246.com/article/1649901726096" : "https://liuyun.io/article/1686530886208"}" target="_blank"> <a class="b3-menu__item" href="${"zh_CN" === window.siyuan.config.lang || "zh_CHT" === window.siyuan.config.lang ? "https://ld246.com/article/1649901726096" : "https://liuyun.io/article/1686530886208"}" target="_blank">

5
app/src/mobile/util/setEmpty.ts
View file

@ -6,6 +6,7 @@ import {getRecentDocs} from "../menu/getRecentDocs";
import {openHistory} from "../../history/history"; import {openHistory} from "../../history/history";
import {App} from "../../index"; import {App} from "../../index";
import {setTitle} from "../../dialog/processSystem"; import {setTitle} from "../../dialog/processSystem";
import {isIPhone} from "../../protyle/util/compatibility";
export const setEmpty = (app: App) => { export const setEmpty = (app: App) => {
setTitle(window.siyuan.languages.siyuanNote); setTitle(window.siyuan.languages.siyuanNote);
@ -31,7 +32,7 @@ export const setEmpty = (app: App) => {
<div class="b3-list-item" id="emptyNewNotebook${window.siyuan.config.readonly ? " fn__none" : ""}"> <div class="b3-list-item" id="emptyNewNotebook${window.siyuan.config.readonly ? " fn__none" : ""}">
<svg class="b3-list-item__graphic"><use xlink:href="#iconFilesRoot"></use></svg><span class="fn__space"></span><span class="b3-list-item__text">${window.siyuan.languages.newNotebook}</span> <svg class="b3-list-item__graphic"><use xlink:href="#iconFilesRoot"></use></svg><span class="fn__space"></span><span class="b3-list-item__text">${window.siyuan.languages.newNotebook}</span>
</div> </div>
<div class="b3-list-item" id="emptyHelp"> <div class="b3-list-item${isIPhone() ? "fn__none" : ""}" id="emptyHelp">
<svg class="b3-list-item__graphic"><use xlink:href="#iconHelp"></use></svg><span class="fn__space"></span><span class="b3-list-item__text">${window.siyuan.languages.userGuide}</span> <svg class="b3-list-item__graphic"><use xlink:href="#iconHelp"></use></svg><span class="fn__space"></span><span class="b3-list-item__text">${window.siyuan.languages.userGuide}</span>
</div>`; </div>`;
emptyElement.addEventListener("click", (event) => { emptyElement.addEventListener("click", (event) => {
@ -77,7 +78,7 @@ export const setEmpty = (app: App) => {
}; };
export const setEditor = () => { export const setEditor = () => {
const toolbarNameElement = document.getElementById("toolbarName") as HTMLInputElement; const toolbarNameElement = document.getElementById("toolbarName") as HTMLInputElement;
setTitle(toolbarNameElement.value); setTitle(toolbarNameElement.value);
toolbarNameElement.classList.remove("fn__hidden"); toolbarNameElement.classList.remove("fn__hidden");
document.getElementById("editor").classList.remove("fn__none"); document.getElementById("editor").classList.remove("fn__none");