nettika/geary
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Minimise DOM changes made by ComposerPageState::cleanContent JS

Browse source 
By overriding ComposerPageState::getHtml to accept a parameter that
supports getting HTML with empty composer parts removed, cleanContent
can simply be made to linkify the page, thus allowing a ComposerWidget
to be re-used multiple times when sending an email.
This commit is contained in:
Michael Gratton 2019-11-08 10:39:46 +11:00 • committed by Michael James Gratton
parent 43803239a4
commit 1447d1acbc
5 changed files with 59 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

46
ui/composer-web-view.js
View file

@ -60,6 +60,9 @@ ComposerPageState.prototype = {
}
this.signaturePart = document.getElementById("geary-signature");
if (this.signaturePart != null) {
ComposerPageState.linkify(this.signaturePart);
}
this.quotePart = document.getElementById("geary-quote");
// Should be using 'e.key' in listeners below instead of
@ -289,38 +292,32 @@ ComposerPageState.prototype = {
},
cleanContent: function() {
// Prevent any modification signals being sent when mutating
// the document below.
// the document
this.stopBodyObserver();
ComposerPageState.cleanPart(this.bodyPart, false);
ComposerPageState.linkify(this.bodyPart);
this.signaturePart = ComposerPageState.cleanPart(this.signaturePart, true);
this.quotePart = ComposerPageState.cleanPart(this.quotePart, true);
this.startBodyObserver();
},
getHtml: function() {
// Clone the message parts so we can clean them without
// modifiying the DOM, needed when saving drafts. In contrast
// with cleanContent above, we don't remove empty elements so
// they still exist when restoring from draft
getHtml: function(removeEmpty) {
if (removeEmpty === undefined) {
removeEmpty = true;
}
let parent = document.createElement("DIV");
parent.appendChild(
ComposerPageState.cleanPart(this.bodyPart.cloneNode(true), false)
ComposerPageState.cleanPart(this.bodyPart.cloneNode(true))
);
if (this.signaturePart != null) {
if (this.signaturePart != null &&
(!removeEmpty || this.signaturePart.innerText.trim() != "")) {
parent.appendChild(
ComposerPageState.cleanPart(
this.signaturePart.cloneNode(true), false
)
ComposerPageState.cleanPart(this.signaturePart.cloneNode(true))
);
}
if (this.quotePart != null) {
if (this.quotePart != null &&
(!removeEmpty || this.quotePart.innerText.trim() != "")) {
parent.appendChild(
ComposerPageState.cleanPart(
this.quotePart.cloneNode(true), false
)
ComposerPageState.cleanPart(this.quotePart.cloneNode(true))
);
}
@ -464,17 +461,12 @@ ComposerPageState.containsKeywords = function(line, wordKeys, suffixKeys) {
};
/**
* Removes internal attributes from a composer part..
* Removes internal attributes from a composer part.
*/
ComposerPageState.cleanPart = function(part, removeIfEmpty) {
ComposerPageState.cleanPart = function(part) {
if (part != null) {
part.removeAttribute("class");
part.removeAttribute("contenteditable");
if (removeIfEmpty && part.innerText.trim() == "") {
part.parentNode.removeChild(part);
part = null;
}
}
return part;
};