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

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

Browse source
This commit is contained in:
Vanessa 2022-11-17 12:01:47 +08:00
parent 97c5c22cb6
commit 6f70891a04
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -373,12 +373,12 @@ export class Toolbar {
item.style.fontSize = ""; item.style.fontSize = "";
} }
if (index === 0 && previousElement && previousElement.nodeType !== 3 && if (index === 0 && previousElement && previousElement.nodeType !== 3 &&
isArrayEqual(types, previousElement.getAttribute("data-type").split(" ")) && isArrayEqual(types, (previousElement.getAttribute("data-type") || "").split(" ")) &&
hasSameTextStyle(item, previousElement, textObj)) { hasSameTextStyle(item, previousElement, textObj)) {
previousIndex = previousElement.textContent.length; previousIndex = previousElement.textContent.length;
previousElement.innerHTML = previousElement.innerHTML + item.innerHTML; previousElement.innerHTML = previousElement.innerHTML + item.innerHTML;
} else if (index === contents.childNodes.length - 1 && nextElement && nextElement.nodeType !== 3 && } else if (index === contents.childNodes.length - 1 && nextElement && nextElement.nodeType !== 3 &&
isArrayEqual(types, nextElement.getAttribute("data-type").split(" ")) && isArrayEqual(types, (nextElement.getAttribute("data-type") || "").split(" ")) &&
hasSameTextStyle(item, nextElement, textObj)) { hasSameTextStyle(item, nextElement, textObj)) {
nextIndex = item.textContent.length; nextIndex = item.textContent.length;
nextElement.innerHTML = item.innerHTML + nextElement.innerHTML; nextElement.innerHTML = item.innerHTML + nextElement.innerHTML;
@ -490,12 +490,12 @@ export class Toolbar {
} }
types = [...new Set(types)]; types = [...new Set(types)];
if (index === 0 && previousElement && previousElement.nodeType !== 3 && if (index === 0 && previousElement && previousElement.nodeType !== 3 &&
isArrayEqual(types, previousElement.getAttribute("data-type").split(" ")) && isArrayEqual(types, (previousElement.getAttribute("data-type") || "").split(" ")) &&
hasSameTextStyle(item, previousElement, textObj)) { hasSameTextStyle(item, previousElement, textObj)) {
previousIndex = previousElement.textContent.length; previousIndex = previousElement.textContent.length;
previousElement.innerHTML = previousElement.innerHTML + item.innerHTML; previousElement.innerHTML = previousElement.innerHTML + item.innerHTML;
} else if (index === contents.childNodes.length - 1 && nextElement && nextElement.nodeType !== 3 && } else if (index === contents.childNodes.length - 1 && nextElement && nextElement.nodeType !== 3 &&
isArrayEqual(types, nextElement.getAttribute("data-type").split(" ")) && isArrayEqual(types, (nextElement.getAttribute("data-type") || "").split(" ")) &&
hasSameTextStyle(item, nextElement, textObj)) { hasSameTextStyle(item, nextElement, textObj)) {
nextIndex = item.textContent.length; nextIndex = item.textContent.length;
nextElement.innerHTML = item.innerHTML + nextElement.innerHTML; nextElement.innerHTML = item.innerHTML + nextElement.innerHTML;