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

🐛 fix https://github.com/siyuan-note/siyuan/issues/5690

Browse source
This commit is contained in:
Vanessa 2022-08-22 00:11:32 +08:00
parent b313ee93ad
commit b61dfc2a7f
3 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/src/config/about.ts
View file

@ -299,6 +299,7 @@ export const about = {
confirmDialog("⚠️ " + window.siyuan.languages.resetRepo, window.siyuan.languages.resetRepoTip, () => {
fetchPost("/api/repo/resetRepo", {}, () => {
window.siyuan.config.repo.key = "";
window.siyuan.config.sync.enabled = false;
importKeyElement.parentElement.classList.remove("fn__none");
importKeyElement.parentElement.nextElementSibling.classList.add("fn__none");
});

1
app/src/mobile/util/menu.ts
View file

@ -372,6 +372,7 @@ ${accountHTML}
confirmDialog(window.siyuan.languages.remove, "", () => {
fetchPost("/api/repo/resetRepo", {}, () => {
window.siyuan.config.repo.key = "";
window.siyuan.config.sync.enabled = false;
importKeyElement.parentElement.classList.remove("fn__none");
importKeyElement.parentElement.nextElementSibling.classList.add("fn__none");
});

11
app/src/protyle/wysiwyg/enter.ts
View file

@ -130,7 +130,10 @@ const listEnter = (protyle: IProtyle, blockElement: HTMLElement, range: Range) =
removeEmptyNode(newElement);
return true;
}
if (range.toString() === "" && range.startContainer.nodeType === 3 && range.startContainer.textContent === Constants.ZWSP && range.startOffset === 0) {
// 图片后的零宽空格前回车 https://github.com/siyuan-note/siyuan/issues/5690
range.setStart(range.startContainer, 1);
}
range.insertNode(document.createElement("wbr"));
const listItemHTML = listItemElement.outerHTML;
const html = listItemElement.parentElement.outerHTML;
@ -212,7 +215,7 @@ export const enter = (blockElement: HTMLElement, range: Range, protyle: IProtyle
// 代码块
const trimStartText = editableElement.innerHTML.trimStart();
if (trimStartText.startsWith("```") || trimStartText.startsWith("···") || trimStartText.startsWith("~~~") ||
trimStartText.indexOf("\n```") > -1 || trimStartText.indexOf("\n~~~") > -1 || trimStartText.indexOf("\n···") > -1) {
trimStartText.indexOf("\n```") > -1 || trimStartText.indexOf("\n~~~") > -1 || trimStartText.indexOf("\n···") > -1) {
if (trimStartText.indexOf("\n") === -1 && trimStartText.replace(/·|~/g, "`").replace(/^`{3,}/g, "").indexOf("`") > -1) {
// ```test` 不处理，正常渲染为段落块
} else {
@ -354,6 +357,10 @@ export const enter = (blockElement: HTMLElement, range: Range, protyle: IProtyle
removeEmptyNode(newElement);
return true;
}
if (range.toString() === "" && range.startContainer.nodeType === 3 && range.startContainer.textContent === Constants.ZWSP && range.startOffset === 0) {
// 图片后的零宽空格前回车 https://github.com/siyuan-note/siyuan/issues/5690
range.setStart(range.startContainer, 1);
}
range.insertNode(document.createElement("wbr"));
const html = blockElement.outerHTML;
if (range.toString() !== "") {