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: ask unload when mobile and message visible

Browse source
This commit is contained in:
the-djmaze 2023-03-20 15:21:56 +01:00
parent 470da2ee15
commit 45be0d7aa8
3 changed files with 5 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
dev/App/User.js
View file

@ -183,7 +183,7 @@ export class AppUser extends AbstractApp {
super.bootstart(); super.bootstart();
addEventListener('beforeunload', event => { addEventListener('beforeunload', event => {
if (arePopupsVisible() || (!SettingsUserStore.layout() && MessageUserStore.message())) { if (arePopupsVisible() || (!SettingsUserStore.usePreviewPane() && MessageUserStore.message())) {
event.preventDefault(); event.preventDefault();
return event.returnValue = i18n('POPUPS_ASK/EXIT_ARE_YOU_SURE'); return event.returnValue = i18n('POPUPS_ASK/EXIT_ARE_YOU_SURE');
} }

4
dev/Stores/User/Settings.js
View file

@ -50,10 +50,10 @@ export const SettingsUserStore = new class {
self.init(); self.init();
self.usePreviewPane = koComputable(() => self.layout() && !ThemeStore.isMobile()); self.usePreviewPane = koComputable(() => ThemeStore.isMobile() ? 0 : self.layout());
const toggleLayout = () => { const toggleLayout = () => {
const value = ThemeStore.isMobile() ? 0 : self.layout(); const value = self.usePreviewPane();
$htmlCL.toggle('sm-msgView-side', Layout.SidePreview === value); $htmlCL.toggle('sm-msgView-side', Layout.SidePreview === value);
$htmlCL.toggle('sm-msgView-bottom', Layout.BottomPreview === value); $htmlCL.toggle('sm-msgView-bottom', Layout.BottomPreview === value);
fireEvent('rl-layout', value); fireEvent('rl-layout', value);

6
dev/View/User/MailBox/MessageList.js
View file

@ -566,11 +566,9 @@ export class MailMessageList extends AbstractViewRight {
// initMailboxLayoutResizer // initMailboxLayoutResizer
const top = dom.querySelector('.messageList'), const top = dom.querySelector('.messageList'),
fToggle = () => { fToggle = () => {
let layout = SettingsUserStore.layout(); let layout = SettingsUserStore.usePreviewPane();
setLayoutResizer(top, ClientSideKeyNameMessageListSize, setLayoutResizer(top, ClientSideKeyNameMessageListSize,
(ThemeStore.isMobile() || !layout) layout ? (Layout.SidePreview === layout ? 'Width' : 'Height') : 0
? 0
: (Layout.SidePreview === layout ? 'Width' : 'Height')
); );
}; };
if (top) { if (top) {