Skip to content

Commit 067a1e8

Browse files
SoltusSoltus
committed
Merge branch 'dev' of https://github.com/ci-win/siyuan into dev
2 parents f1f83cc + b1e7624 commit 067a1e8

File tree

4 files changed

+69
-21
lines changed

4 files changed

+69
-21
lines changed

‎app/src/card/openCard.ts

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,10 @@ export const openCardByData = (cardsData: ICard[], html = "") => {
4444
<div class="card__header">
4545
<span class="fn__flex-1 fn__flex-center">${window.siyuan.languages.riffCard}</span>
4646
${html}
47-
${isMobile() ? "" : `<div class="fn__space"></div>
48-
<div data-type="fullscreen" class="b3-tooltips b3-tooltips__sw block__icon block__icon--show" aria-label="${window.siyuan.languages.fullscreen}">
47+
<div class="fn__space"></div>
48+
${isMobile() ? `<div data-type="close" class="block__icon block__icon--show">
49+
<svg><use xlink:href="#iconCloseRound"></use></svg>
50+
</div>` : `<div data-type="fullscreen" class="b3-tooltips b3-tooltips__sw block__icon block__icon--show" aria-label="${window.siyuan.languages.fullscreen}">
4951
<svg><use xlink:href="#iconFullscreen"></use></svg>
5052
</div>`}
5153
</div>
@@ -100,8 +102,8 @@ export const openCardByData = (cardsData: ICard[], html = "") => {
100102
</div>
101103
</div>
102104
</div>`,
103-
width: isMobile() ? "98vw" : "80vw",
104-
height: isMobile() ? "80vh" : "70vh",
105+
width: isMobile() ? "100vw" : "80vw",
106+
height: isMobile() ? "100vh" : "70vh",
105107
});
106108
(dialog.element.querySelector(".b3-dialog__scrim") as HTMLElement).style.backgroundColor = "var(--b3-theme-background)";
107109
(dialog.element.querySelector(".b3-dialog__container") as HTMLElement).style.maxWidth = "1024px";
@@ -142,6 +144,13 @@ export const openCardByData = (cardsData: ICard[], html = "") => {
142144
event.preventDefault();
143145
return;
144146
}
147+
const closeElement = hasClosestByAttribute(event.target as HTMLElement, "data-type", "close");
148+
if (closeElement) {
149+
dialog.destroy();
150+
event.stopPropagation();
151+
event.preventDefault();
152+
return;
153+
}
145154
let type = "";
146155
if (typeof event.detail === "string") {
147156
if (event.detail === "1" || event.detail === "j") {

‎app/src/mobile/menu/index.ts

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import {login, showAccountInfo} from "../settings/account";
1414
import {openModel} from "./model";
1515
import {initAbout} from "../settings/about";
1616
import {getRecentDocs} from "./getRecentDocs";
17+
import {initEditor} from "../settings/editor";
1718

1819
export const popMenu = () => {
1920
activeBlur();
@@ -69,6 +70,9 @@ ${accountHTML}
6970
<svg class="b3-menu__icon"><use xlink:href="#iconQuit"></use></svg><span class="b3-menu__label">${window.siyuan.languages.safeQuit}</span>
7071
</div>
7172
<div class="b3-menu__separator"></div>
73+
<div class="b3-menu__item${window.siyuan.config.readonly ? " fn__none" : ""}" id="menuEditor">
74+
<svg class="b3-menu__icon"><use xlink:href="#iconEdit"></use></svg><span class="b3-menu__label">${window.siyuan.languages.editor}</span>
75+
</div>
7276
<div class="b3-menu__item${window.siyuan.config.readonly ? " fn__none" : ""}" id="menuRiffCard">
7377
<svg class="b3-menu__icon"><use xlink:href="#iconRiffCard"></use></svg><span class="b3-menu__label">${window.siyuan.languages.riffCard}</span>
7478
</div>
@@ -127,6 +131,11 @@ ${accountHTML}
127131
event.preventDefault();
128132
event.stopPropagation();
129133
break;
134+
} else if (target.id === "menuEditor") {
135+
initEditor();
136+
event.preventDefault();
137+
event.stopPropagation();
138+
break;
130139
} else if (target.id === "menuSafeQuit") {
131140
exitSiYuan();
132141
event.preventDefault();

‎app/src/mobile/settings/appearance.ts

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -44,25 +44,8 @@ export const initAppearance = () => {
4444
<div class="fn__hr"></div>
4545
<select id="lang" class="b3-select fn__block">${genOptions(window.siyuan.config.langs, window.siyuan.config.appearance.lang)}</select>
4646
<div class="b3-label__text">${window.siyuan.languages.language1}</div>
47-
</div>
48-
<div class="b3-label">
49-
${window.siyuan.languages.fontSize} <span id="fontSize" class="ft__on-surface">${window.siyuan.config.editor.fontSize}px</span>
50-
<div class="fn__hr"></div>
51-
<input class="b3-slider fn__block" max="72" min="9" step="1" type="range" value="${window.siyuan.config.editor.fontSize}">
52-
<div class="b3-label__text">${window.siyuan.languages.fontSizeTip}</div>
5347
</div>`,
5448
bindEvent(modelMainElement: HTMLElement) {
55-
modelMainElement.querySelector(".b3-slider").addEventListener("input", (event: InputEvent & {
56-
target: HTMLInputElement
57-
}) => {
58-
modelMainElement.querySelector("#fontSize").textContent = event.target.value + "px";
59-
window.siyuan.config.editor.fontSize = parseInt(event.target.value);
60-
fetchPost("/api/setting/setEditor", window.siyuan.config.editor, (response) => {
61-
window.siyuan.config.editor = response.data;
62-
reloadProtyle(window.siyuan.mobile.editor.protyle);
63-
setInlineStyle();
64-
});
65-
});
6649
modelMainElement.querySelectorAll("select").forEach(item => {
6750
item.addEventListener("change", () => {
6851
const modeElementValue = parseInt((modelMainElement.querySelector("#mode") as HTMLSelectElement).value);

‎app/src/mobile/settings/editor.ts

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
import {openModel} from "../menu/model";
2+
import {fetchPost} from "../../util/fetch";
3+
import {reloadProtyle} from "../../protyle/util/reload";
4+
import {setInlineStyle} from "../../util/assets";
5+
6+
const reloadEditor = (data: IEditor) => {
7+
window.siyuan.config.editor = data;
8+
reloadProtyle(window.siyuan.mobile.editor.protyle);
9+
setInlineStyle();
10+
}
11+
12+
export const initEditor = () => {
13+
openModel({
14+
title: window.siyuan.languages.riffCard,
15+
icon: "iconRiffCard",
16+
html: `<div class="b3-label">
17+
${window.siyuan.languages.fontSize} <span id="fontSize" class="ft__on-surface">${window.siyuan.config.editor.fontSize}px</span>
18+
<div class="fn__hr"></div>
19+
<input class="b3-slider fn__block" max="72" min="9" step="1" type="range" value="${window.siyuan.config.editor.fontSize}">
20+
<div class="b3-label__text">${window.siyuan.languages.fontSizeTip}</div>
21+
</div>
22+
<div class="b3-label">
23+
${window.siyuan.languages.katexMacros}
24+
<div class="fn__hr"></div>
25+
<textarea class="b3-text-field fn__block" id="katexMacros">${window.siyuan.config.editor.katexMacros}</textarea>
26+
<div class="b3-label__text">${window.siyuan.languages.katexMacrosTip}</div>
27+
</div>`,
28+
bindEvent(modelMainElement: HTMLElement) {
29+
modelMainElement.querySelector(".b3-slider").addEventListener("input", (event: InputEvent & {
30+
target: HTMLInputElement
31+
}) => {
32+
modelMainElement.querySelector("#fontSize").textContent = event.target.value + "px";
33+
window.siyuan.config.editor.fontSize = parseInt(event.target.value);
34+
fetchPost("/api/setting/setEditor", window.siyuan.config.editor, (response) => {
35+
reloadEditor(response.data)
36+
});
37+
});
38+
const katexMacrosElement = modelMainElement.querySelector("#katexMacros") as HTMLTextAreaElement;
39+
katexMacrosElement.addEventListener("blur", () => {
40+
window.siyuan.config.editor.katexMacros = katexMacrosElement.value;
41+
fetchPost("/api/setting/setEditor", window.siyuan.config.editor, (response) => {
42+
reloadEditor(response.data)
43+
});
44+
})
45+
}
46+
});
47+
};

0 commit comments

Comments
 (0)