1berry/webmin
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix to include forwarded message on empty body

Browse Source 
a268373550 (r142447419)

[build]
This commit is contained in:
Ilia Ross 2024-05-28 16:56:23 +03:00
parent d6bed07aae
commit 68b547d55a
No known key found for this signature in database
GPG Key ID: 121E166DD9C821AB
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
html-editor-lib.pl
View File

@ -245,6 +245,11 @@ $navigation_type ||= 'reload';
my $html_editor_init_script = my $html_editor_init_script =
<<EOF; <<EOF;
<script type="text/javascript"> <script type="text/javascript">
function fn_${module_name}_quote_mail_iframe_loaded() {
const editor = fn_${module_name}_html_editor_init.editor;
editor.root.innerHTML = "\\n" + editor.root.innerHTML;
fn_${module_name}_quote_mail_iframe_loaded = null;
}
function fn_${module_name}_html_editor_init() { function fn_${module_name}_html_editor_init() {
const targ = document.querySelector('[$target_attr$target_type"$target_name"]'), const targ = document.querySelector('[$target_attr$target_type"$target_name"]'),
qs = Quill.import('attributors/style/size'), qs = Quill.import('attributors/style/size'),
@ -277,6 +282,8 @@ my $html_editor_init_script =
theme: 'snow' theme: 'snow'
}); });
fn_${module_name}_html_editor_init.editor = editor;
// Google Mail like key bind for creating numbered list (Ctrl+Shift+7) // Google Mail like key bind for creating numbered list (Ctrl+Shift+7)
editor.keyboard.addBinding({ editor.keyboard.addBinding({
key: '7', key: '7',

3
mailboxes/folders-lib.pl
View File

@ -3091,6 +3091,9 @@ my $iframe_body = <<EOF;
</style> </style>
<script> <script>
function quote_mail_iframe_onload(iframe) { function quote_mail_iframe_onload(iframe) {
if (typeof fn_${module_name}_quote_mail_iframe_loaded === 'function') {
fn_${module_name}_quote_mail_iframe_loaded(iframe);
}
if (typeof theme_quote_mail_iframe_onload === 'function') { if (typeof theme_quote_mail_iframe_onload === 'function') {
theme_quote_mail_iframe_onload(iframe); theme_quote_mail_iframe_onload(iframe);
return; return;