Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-07-13 03:27:39 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Bugfix and improve Squire HTML/Plain modes

Browse source
This commit is contained in:
djmaze 2021-08-16 18:09:54 +02:00
parent 5efbcf5ad3
commit 1c95eab6d6
4 changed files with 17 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

11
dev/View/Popup/Compose.js
View file

@ -130,7 +130,6 @@ class ComposePopupView extends AbstractViewPopup {
this.allowContacts = AppUserStore.allowContacts();
this.bSkipNextHide = false;
this.editorDefaultType = SettingsUserStore.editorDefaultType;
this.capaOpenPGP = PgpUserStore.capaOpenPGP;
@ -716,6 +715,8 @@ class ComposePopupView extends AbstractViewPopup {
this.autosaveStart();
this.viewModelDom.dataset.wysiwyg = SettingsUserStore.editorDefaultType();
if (AppUserStore.composeInEdit()) {
type = type || ComposeType.Empty;
if (ComposeType.Empty !== type) {
@ -772,7 +773,7 @@ class ComposePopupView extends AbstractViewPopup {
}
isPlainEditor() {
let type = this.editorDefaultType();
let type = SettingsUserStore.editorDefaultType();
return EditorDefaultType.Html !== type && EditorDefaultType.HtmlForced !== type;
}
@ -971,8 +972,8 @@ class ComposePopupView extends AbstractViewPopup {
editor.setHtml(sText);
if (
EditorDefaultType.PlainForced === this.editorDefaultType() ||
(!message.isHtml() && EditorDefaultType.HtmlForced !== this.editorDefaultType())
EditorDefaultType.PlainForced === SettingsUserStore.editorDefaultType() ||
(!message.isHtml() && EditorDefaultType.HtmlForced !== SettingsUserStore.editorDefaultType())
) {
editor.modePlain();
}
@ -1256,7 +1257,7 @@ class ComposePopupView extends AbstractViewPopup {
ro.toolbar = dom.querySelector('.b-header-toolbar');
ro.els = [dom.querySelector('.textAreaParent'), dom.querySelector('.attachmentAreaParent')];
this.editor(editor => editor.modeWysiwyg());
this.editor(editor => editor[this.isPlainEditor()?'modePlain':'modeWysiwyg']());
// Fullscreen must be on app, else other popups fail
const el = doc.getElementById('rl-app');