0ct0pu5/siyuan
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

🎨 https://github.com/siyuan-note/siyuan/issues/9727 转义符dom修改

Browse source
This commit is contained in:
Vanessa 2023-11-24 20:54:08 +08:00
parent d47d5ade8e
commit 079328dee9
3 changed files with 2 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/src/protyle/toolbar/index.ts
View file

@ -561,10 +561,6 @@ export class Toolbar {
nextIndex = item.textContent.length;
nextElement.innerHTML = item.innerHTML + nextElement.innerHTML;
} else if (item.tagName !== "BR" && item.tagName !== "IMG") {
if (item.getAttribute("data-type")?.indexOf("backslash") > -1 &&
item.firstChild?.textContent === "\\") {
item.firstChild.remove();
}
item.setAttribute("data-type", types.join(" "));
setFontStyle(item, textObj);
newNodes.push(item);

9
app/src/protyle/wysiwyg/input.ts
View file

@ -145,13 +145,8 @@ export const input = async (protyle: IProtyle, blockElement: HTMLElement, range:
if (blockElement.classList.contains("table")) {
scrollLeft = getContenteditableElement(blockElement).scrollLeft;
}
if (/<span data-type="backslash"><span>\\<\/span>.<\/span><wbr>/.test(html)) {
// 转义不需要添加 zwsp
blockElement.outerHTML = html;
} else {
// 使用 md 闭合后继续输入应为普通文本
blockElement.outerHTML = html.replace("</span><wbr>", "</span>" + Constants.ZWSP + "<wbr>");
}
// 使用 md 闭合后继续输入应为普通文本
blockElement.outerHTML = html.replace("</span><wbr>", "</span>" + Constants.ZWSP + "<wbr>");
protyle.wysiwyg.element.querySelectorAll(`[data-node-id="${id}"]`).forEach((item: HTMLElement) => {
if (item.getAttribute("data-type") === "NodeBlockQueryEmbed" ||
!hasClosestByAttribute(item, "data-type", "NodeBlockQueryEmbed")) {

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

@ -757,27 +757,6 @@ export const keydown = (protyle: IProtyle, editorElement: HTMLElement) => {
return;
}
}
// 行首转义符前删除 https://github.com/siyuan-note/siyuan/issues/6092
if (range.startOffset === 0 && selectText === "" &&
previousSibling && previousSibling.parentElement.getAttribute("data-type")?.indexOf("backslash") > -1 &&
previousSibling.nodeType !== 3 && (previousSibling as HTMLElement).outerHTML === "<span>\\</span>" &&
!hasPreviousSibling(previousSibling.parentElement)) {
range.setStartBefore(previousSibling.parentElement);
removeBlock(protyle, nodeElement, range);
event.stopPropagation();
event.preventDefault();
return;
}
// 光标位于转义符前 F5 后，rang 和点击后的不同，也需进行判断
if (range.startOffset === 1 && range.startContainer.nodeType !== 3 &&
range.startContainer.parentElement.getAttribute("data-type")?.indexOf("backslash") > -1 &&
!hasPreviousSibling(range.startContainer.parentElement)) {
range.setStartBefore(range.startContainer.parentElement);
removeBlock(protyle, nodeElement, range);
event.stopPropagation();
event.preventDefault();
return;
}
const imgSelectElement = protyle.wysiwyg.element.querySelector(".img--select");
if (imgSelectElement) {
imgSelectElement.classList.remove("img--select");