callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

I#1657 - Composer: Correct empty paragraph detection for removal

Browse Source 
Closes https://gitlab.gnome.org/GNOME/evolution/-/issues/1657
This commit is contained in:
Milan Crha
2021-10-12 16:13:45 +02:00
parent 6e2dd9d434
commit c61022b004
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
data/webkit/e-editor.js
View File

@ -3197,6 +3197,16 @@ EvoEditor.maybeRemoveQuotationMark = function(node)
return true; return true;
} }
EvoEditor.isQuotedElementEmpty = function(node)
{
for (node = node.firstChild; node !== null; node = node.nextSibling) {
// the text inside is not empty
if (node.nodeType == node.TEXT_NODE && node.nodeValue !== null && node.nodeValue !== "")
return false;
}
return true;
}
EvoEditor.removeEmptyElements = function(tagName) EvoEditor.removeEmptyElements = function(tagName)
{ {
var nodes, node, ii, didRemove = 0; var nodes, node, ii, didRemove = 0;
@ -3215,9 +3225,7 @@ EvoEditor.removeEmptyElements = function(tagName)
node.firstElementChild.className != "-x-evo-quoted")) node.firstElementChild.className != "-x-evo-quoted"))
continue; continue;
// the text inside is not empty, possibly on either of the two sides of the quotation mark if (!EvoEditor.isQuotedElementEmpty(node))
if ((node.firstChild && (node.firstChild.nodeType == node.TEXT_NODE && node.firstChild.nodeValue)) ||
(node.lastChild && !(node.lastChild === node.firstChild) && (node.lastChild.nodeType == node.TEXT_NODE && node.lastChild.nodeValue)))
continue; continue;
// it's either completely empty or it contains only the quotation mark and nothing else // it's either completely empty or it contains only the quotation mark and nothing else