fix removing html elements added by thunderai when extracting text or html from the email. see #710
This commit is contained in:
parent
7d2b811926
commit
0b3c66b78d
2 changed files with 21 additions and 27 deletions
|
|
@ -26,11 +26,14 @@ const MZTA_INJECTED_SELECTORS = [
|
|||
'.mzta_dialog',
|
||||
];
|
||||
|
||||
// Mirrors removeMozMainHeader() from mzta-utils.js.
|
||||
// Removes the Thunderbird-injected header table and any preceding divs.
|
||||
function removeMozMainHeader(root) {
|
||||
const table = root.querySelector('table.moz-main-header');
|
||||
if (!table) return;
|
||||
function getCleanBodyHtml() {
|
||||
const clone = document.body.cloneNode(true);
|
||||
for (const selector of MZTA_INJECTED_SELECTORS) {
|
||||
for (const el of clone.querySelectorAll(selector)) {
|
||||
el.remove();
|
||||
}
|
||||
}
|
||||
for (const table of clone.querySelectorAll('table.moz-main-header')) {
|
||||
let sibling = table.previousElementSibling;
|
||||
while (sibling && sibling.tagName === 'DIV') {
|
||||
const toRemove = sibling;
|
||||
|
|
@ -39,15 +42,6 @@ function removeMozMainHeader(root) {
|
|||
}
|
||||
table.remove();
|
||||
}
|
||||
|
||||
function getCleanBodyClone() {
|
||||
const clone = document.body.cloneNode(true);
|
||||
for (const selector of MZTA_INJECTED_SELECTORS) {
|
||||
for (const el of clone.querySelectorAll(selector)) {
|
||||
el.remove();
|
||||
}
|
||||
}
|
||||
removeMozMainHeader(clone);
|
||||
return clone;
|
||||
}
|
||||
|
||||
|
|
@ -95,7 +89,7 @@ switch (message.command) {
|
|||
|
||||
case "getText": {
|
||||
let t = '';
|
||||
const children = getCleanBodyClone().childNodes;
|
||||
const children = getCleanBodyHtml().childNodes;
|
||||
for (const node of children) {
|
||||
if (node instanceof Element) {
|
||||
if (node.classList.contains('moz-signature')) {
|
||||
|
|
@ -108,11 +102,11 @@ switch (message.command) {
|
|||
}
|
||||
|
||||
case "getTextOnly": {
|
||||
return Promise.resolve(getCleanBodyClone().innerText);
|
||||
return Promise.resolve(getCleanBodyHtml().innerText);
|
||||
}
|
||||
|
||||
case "getFullHtml": {
|
||||
return Promise.resolve(getCleanBodyClone().innerHTML);
|
||||
return Promise.resolve(getCleanBodyHtml().innerHTML);
|
||||
}
|
||||
|
||||
case "getOnlyTypedText": {
|
||||
|
|
|
|||
|
|
@ -272,8 +272,7 @@ export function htmlBodyToPlainText(htmlString) {
|
|||
}
|
||||
|
||||
export function removeMozMainHeader(root) {
|
||||
const table = root.querySelector('table.moz-main-header');
|
||||
if (!table) return;
|
||||
for (const table of root.querySelectorAll('table.moz-main-header')) {
|
||||
let sibling = table.previousElementSibling;
|
||||
while (sibling && sibling.tagName === 'DIV') {
|
||||
const toRemove = sibling;
|
||||
|
|
@ -282,6 +281,7 @@ export function removeMozMainHeader(root) {
|
|||
}
|
||||
table.remove();
|
||||
}
|
||||
}
|
||||
|
||||
export function cleanupNewlines(text) {
|
||||
return text
|
||||
|
|
|
|||
Loading…
Reference in a new issue