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

🚨

Browse source
This commit is contained in:
Vanessa 2023-05-21 23:14:05 +08:00
parent ddeeba87e7
commit 17f6ab335b
4 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/menus/Menu.ts
View file

@ -116,7 +116,7 @@ export class Menu {
return; return;
} }
if (typeof index === "number") { if (typeof index === "number") {
const insertElement = this.element.querySelectorAll(".b3-menu__items > .b3-menu__separator")[index] const insertElement = this.element.querySelectorAll(".b3-menu__items > .b3-menu__separator")[index];
if (insertElement) { if (insertElement) {
insertElement.before(element); insertElement.before(element);
return; return;

2
app/src/plugin/index.ts
View file

@ -217,5 +217,5 @@ export class Plugin {
nodeIds: options.ids, nodeIds: options.ids,
defIds: options.defIds, defIds: options.defIds,
})); }));
} };
} }

8
app/src/protyle/toolbar/Font.ts
View file

@ -14,11 +14,11 @@ export class Font extends ToolbarItem {
this.element.addEventListener("click", () => { this.element.addEventListener("click", () => {
let nodeElements: Element[]; let nodeElements: Element[];
if (protyle.toolbar.range.toString() === "") { if (protyle.toolbar.range.toString() === "") {
nodeElements = Array.from(protyle.wysiwyg.element.querySelectorAll(".protyle-wysiwyg--select")) nodeElements = Array.from(protyle.wysiwyg.element.querySelectorAll(".protyle-wysiwyg--select"));
if (nodeElements.length === 0) { if (nodeElements.length === 0) {
const nodeElement = hasClosestBlock(protyle.toolbar.range.startContainer); const nodeElement = hasClosestBlock(protyle.toolbar.range.startContainer);
if (nodeElement) { if (nodeElement) {
nodeElements = [nodeElement] nodeElements = [nodeElement];
} }
} }
} }
@ -94,7 +94,7 @@ export const appearanceMenu = (protyle: IProtyle, nodeElements?: Element[]) => {
}); });
lastColorHTML += "</div>"; lastColorHTML += "</div>";
} }
let textElement: HTMLElement let textElement: HTMLElement;
let fontSize = "16px"; let fontSize = "16px";
if (nodeElements && nodeElements.length > 0) { if (nodeElements && nodeElements.length > 0) {
textElement = nodeElements[0] as HTMLElement; textElement = nodeElements[0] as HTMLElement;
@ -216,7 +216,7 @@ export const fontEvent = (protyle: IProtyle, nodeElements: Element[], type?: str
e.style.backgroundColor = ""; e.style.backgroundColor = "";
e.style.fontSize = ""; e.style.fontSize = "";
} else if (type === "style1") { } else if (type === "style1") {
const colorList = color.split(Constants.ZWSP) const colorList = color.split(Constants.ZWSP);
e.style.backgroundColor = colorList[0]; e.style.backgroundColor = colorList[0];
e.style.color = colorList[1]; e.style.color = colorList[1];
} else if (type === "style2") { } else if (type === "style2") {

4
app/src/protyle/wysiwyg/keydown.ts
View file

@ -1290,11 +1290,11 @@ export const keydown = (app: App, protyle: IProtyle, editorElement: HTMLElement)
// toolbar action // toolbar action
if (matchHotKey(window.siyuan.config.keymap.editor.insert.lastUsed.custom, event)) { if (matchHotKey(window.siyuan.config.keymap.editor.insert.lastUsed.custom, event)) {
protyle.toolbar.range = range; protyle.toolbar.range = range;
let selectElements: Element[] = [] let selectElements: Element[] = [];
if (selectText === "") { if (selectText === "") {
selectElements = Array.from(protyle.wysiwyg.element.querySelectorAll(".protyle-wysiwyg--select")); selectElements = Array.from(protyle.wysiwyg.element.querySelectorAll(".protyle-wysiwyg--select"));
if (selectElements.length === 0) { if (selectElements.length === 0) {
selectElements = [nodeElement] selectElements = [nodeElement];
} }
} }
fontEvent(protyle, selectElements); fontEvent(protyle, selectElements);