From b655e0ad700cfd325c0c04645268259ef7871660 Mon Sep 17 00:00:00 2001
From: the-djmaze <>
Date: Tue, 22 Nov 2022 09:53:46 +0100
Subject: [PATCH] Bugfix: .apply() error on leftPanelDisabled.toggle
---
dev/Common/Globals.js | 4 ++--
dev/Knoin/AbstractViews.js | 3 ++-
dev/View/Admin/Settings/Pane.js | 3 ++-
dev/View/User/MailBox/MessageList.js | 3 ++-
dev/View/User/Settings/Pane.js | 3 ++-
.../app/templates/Views/Admin/AdminPane.html | 2 +-
.../templates/Views/User/MailFolderList.html | 4 ++--
.../templates/Views/User/MailMessageList.html | 2 +-
.../templates/Views/User/SettingsMenu.html | 4 ++--
.../templates/Views/User/SettingsPane.html | 2 +-
vendors/fontastic/fonts/snappymail.woff | Bin 10024 -> 9940 bytes
vendors/fontastic/fonts/snappymail.woff2 | Bin 7968 -> 7904 bytes
vendors/fontastic/styles.css | 6 ------
13 files changed, 17 insertions(+), 19 deletions(-)
diff --git a/dev/Common/Globals.js b/dev/Common/Globals.js
index 22f4b4e94..e098809c1 100644
--- a/dev/Common/Globals.js
+++ b/dev/Common/Globals.js
@@ -20,6 +20,7 @@ export const
moveAction = ko.observable(false),
leftPanelDisabled = ko.observable(false),
+ toggleLeftPanel = () => leftPanelDisabled(!leftPanelDisabled()),
createElement = (name, attr) => {
let el = doc.createElement(name);
@@ -68,10 +69,9 @@ dropdownVisibility.subscribe(value => {
}
});
-leftPanelDisabled.toggle = () => leftPanelDisabled(!leftPanelDisabled());
leftPanelDisabled.subscribe(value => {
value && moveAction() && moveAction(false);
$htmlCL.toggle('rl-left-panel-disabled', value);
});
-moveAction.subscribe(value => value && leftPanelDisabled() && leftPanelDisabled(false));
+moveAction.subscribe(value => value && leftPanelDisabled(false));
diff --git a/dev/Knoin/AbstractViews.js b/dev/Knoin/AbstractViews.js
index 91be6625e..ac24d66ac 100644
--- a/dev/Knoin/AbstractViews.js
+++ b/dev/Knoin/AbstractViews.js
@@ -1,7 +1,7 @@
import ko from 'ko';
import { addObservablesTo, addComputablesTo, addSubscribablesTo } from 'External/ko';
-import { keyScope, addShortcut, SettingsGet, leftPanelDisabled, elementById } from 'Common/Globals';
+import { keyScope, addShortcut, SettingsGet, leftPanelDisabled, toggleLeftPanel, elementById } from 'Common/Globals';
import { ViewTypePopup, showScreenPopup } from 'Knoin/Knoin';
import { SaveSettingStatus } from 'Common/Enums';
@@ -97,6 +97,7 @@ export class AbstractViewLeft extends AbstractView
{
super(templateID, 'left');
this.leftPanelDisabled = leftPanelDisabled;
+ this.toggleLeftPanel = toggleLeftPanel;
}
}
diff --git a/dev/View/Admin/Settings/Pane.js b/dev/View/Admin/Settings/Pane.js
index 207c90440..c19c1d7d7 100644
--- a/dev/View/Admin/Settings/Pane.js
+++ b/dev/View/Admin/Settings/Pane.js
@@ -2,12 +2,13 @@ import Remote from 'Remote/Admin/Fetch';
import { AbstractViewRight } from 'Knoin/AbstractViews';
-import { leftPanelDisabled } from 'Common/Globals';
+import { leftPanelDisabled, toggleLeftPanel } from 'Common/Globals';
export class PaneSettingsAdminView extends AbstractViewRight {
constructor() {
super('AdminPane');
this.leftPanelDisabled = leftPanelDisabled;
+ this.toggleLeftPanel = toggleLeftPanel;
}
logoutClick() {
diff --git a/dev/View/User/MailBox/MessageList.js b/dev/View/User/MailBox/MessageList.js
index 5de188bda..1ba1d4ee2 100644
--- a/dev/View/User/MailBox/MessageList.js
+++ b/dev/View/User/MailBox/MessageList.js
@@ -5,7 +5,7 @@ import { Scope } from 'Common/Enums';
import { ComposeType, FolderType, MessageSetAction } from 'Common/EnumsUser';
-import { leftPanelDisabled, moveAction,
+import { leftPanelDisabled, toggleLeftPanel, moveAction,
Settings, SettingsCapa,
addEventsListeners,
addShortcut, registerShortcut, formFieldFocused
@@ -83,6 +83,7 @@ export class MailMessageList extends AbstractViewRight {
this.isMobile = ThemeStore.isMobile;
this.leftPanelDisabled = leftPanelDisabled;
+ this.toggleLeftPanel = toggleLeftPanel;
this.popupVisibility = arePopupsVisible;
diff --git a/dev/View/User/Settings/Pane.js b/dev/View/User/Settings/Pane.js
index d9d9916f4..0c7c43f2c 100644
--- a/dev/View/User/Settings/Pane.js
+++ b/dev/View/User/Settings/Pane.js
@@ -1,6 +1,6 @@
import { mailbox } from 'Common/Links';
import { getFolderInboxName } from 'Common/Cache';
-import { leftPanelDisabled } from 'Common/Globals';
+import { leftPanelDisabled, toggleLeftPanel } from 'Common/Globals';
import { MessageUserStore } from 'Stores/User/Message';
import { ThemeStore } from 'Stores/Theme';
@@ -13,6 +13,7 @@ export class SettingsPaneUserView extends AbstractViewRight {
this.isMobile = ThemeStore.isMobile;
this.leftPanelDisabled = leftPanelDisabled;
+ this.toggleLeftPanel = toggleLeftPanel;
}
onShow() {
diff --git a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminPane.html b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminPane.html
index b261adad7..dc46592eb 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminPane.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminPane.html
@@ -1,5 +1,5 @@
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/MailFolderList.html b/snappymail/v/0.0.0/app/templates/Views/User/MailFolderList.html
index cc360516a..a46b64465 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/MailFolderList.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/MailFolderList.html
@@ -24,10 +24,10 @@
-
+