diff --git a/dev/View/Popup/FolderClear.js b/dev/View/Popup/FolderClear.js
index a960642b6..a5ac68765 100644
--- a/dev/View/Popup/FolderClear.js
+++ b/dev/View/Popup/FolderClear.js
@@ -13,55 +13,42 @@ export class FolderClearPopupView extends AbstractViewPopup {
super('FolderClear');
this.addObservables({
- selectedFolder: null,
- clearingProcess: false,
- clearingError: ''
+ folder: null,
+ clearing: false
});
this.addComputables({
dangerDescHtml: () => {
- const folder = this.selectedFolder();
-// return i18n('POPUPS_CLEAR_FOLDER/DANGER_DESC_HTML_1', { FOLDER: folder ? folder.fullName.replace(folder.delimiter, ' / ') : '' });
- return i18n('POPUPS_CLEAR_FOLDER/DANGER_DESC_HTML_1', { FOLDER: folder ? folder.localName() : '' });
+// const folder = this.folder();
+// return i18n('POPUPS_CLEAR_FOLDER/DANGER_DESC_HTML_1', { FOLDER: folder.fullName.replace(folder.delimiter, ' / ') });
+ return i18n('POPUPS_CLEAR_FOLDER/DANGER_DESC_HTML_1', { FOLDER: this.folder()?.localName() });
}
});
decorateKoCommands(this, {
- clearCommand: self => {
- const folder = self.selectedFolder();
- return !self.clearingProcess() && null !== folder;
- }
+ clearCommand: self => !self.clearing()
});
}
clearCommand() {
- const folderToClear = this.selectedFolder();
- if (folderToClear) {
- MessageUserStore.message(null);
- MessagelistUserStore([]);
-
- this.clearingProcess(true);
-
- folderToClear.totalEmails(0);
- folderToClear.unreadEmails(0);
- folderToClear.hash = '';
-
+ const folder = this.folder();
+ if (folder) {
+ this.clearing(true);
Remote.request('FolderClear', iError => {
- this.clearingProcess(false);
- if (iError) {
- this.clearingError(getNotification(iError));
- } else {
- MessagelistUserStore.reload(true);
- this.close();
- }
+ folder.totalEmails(0);
+ folder.unreadEmails(0);
+ MessageUserStore.message(null);
+ MessagelistUserStore.reload(true, true);
+ this.clearing(false);
+ iError ? alert(getNotification(iError)) : this.close();
}, {
- Folder: folderToClear.fullName
+ Folder: folder.fullName
});
}
}
onShow(folder) {
- this.clearingProcess(false);
- this.selectedFolder(folder || null);
+ this.clearing(false);
+ this.folder(folder);
}
}
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/PopupsFolderClear.html b/snappymail/v/0.0.0/app/templates/Views/User/PopupsFolderClear.html
index d5f23ee4a..aedc87df8 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/PopupsFolderClear.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/PopupsFolderClear.html
@@ -1,23 +1,18 @@