Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-09-02 22:17:03 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Move blockquote switcher to HTML parser #902

Browse source
This commit is contained in:
the-djmaze 2023-02-03 11:17:16 +01:00
parent 39bb3719c2
commit c6db5f1def
2 changed files with 26 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

28
dev/Common/Html.js
View file

@ -1,4 +1,4 @@
import { createElement } from 'Common/Globals';
import { doc, createElement } from 'Common/Globals';
import { forEachObjectEntry, pInt } from 'Common/Utils';
import { SettingsUserStore } from 'Stores/User/Settings';
@ -14,6 +14,24 @@ const
"'": '''
},
hcont = Element.fromHTML('<div area="hidden" style="position:absolute;left:-200vw;width:max(50vw,400px)"></div>'),
getRealHeight = el => {
hcont.innerHTML = el.outerHTML;
const result = hcont.clientHeight;
hcont.innerHTML = '';
return result;
},
blockquoteSwitcher = () => {
tpl.content.querySelectorAll('blockquote').forEach(node => {
let h = node.clientHeight || getRealHeight(node);
if (0 === h || 100 < h) {
const el = Element.fromHTML('<details class="sm-bq-switcher"><summary>•••</summary></details>');
node.replaceWith(el);
el.append(node);
}
});
},
replaceWithChildren = node => node.replaceWith(...[...node.childNodes]),
url = /(^|\s|\n|\/?>)(https?:\/\/[-A-Z0-9+&#/%?=()~_|!:,.;]*[-A-Z0-9+&#/%=~()_|])/gi,
@ -79,6 +97,8 @@ const
return url;
};
doc.body.append(hcont);
export const
/**
@ -435,6 +455,8 @@ export const
}
});
blockquoteSwitcher();
// return tpl.content.firstChild;
result.html = tpl.innerHTML.trim();
return result;
@ -588,7 +610,7 @@ export const
aText = aNextText;
} while (bDo);
return aText.join('\n')
tpl.innerHTML = aText.join('\n')
// .replace(/~~~\/blockquote~~~\n~~~blockquote~~~/g, '\n')
.replace(/&/g, '&amp;')
.replace(/>/g, '&gt;')
@ -602,6 +624,8 @@ export const
.replace(/~~~blockquote~~~\s*/g, '<blockquote>')
.replace(/\s*~~~\/blockquote~~~/g, '</blockquote>')
.replace(/\n/g, '<br>');
blockquoteSwitcher();
return tpl.innerHTML.trim();
},
WYSIWYGS = ko.observableArray();