mirror of
https://github.com/the-djmaze/snappymail.git
synced 2026-08-28 19:49:20 +03:00
Changes for "Request failed" error #1220
This commit is contained in:
parent
4c5f19579c
commit
4e04461f80
7 changed files with 104 additions and 156 deletions
|
|
@ -15,7 +15,7 @@ import { encodeHtml, HtmlEditor, htmlToPlain } from 'Common/Html';
|
|||
import { koArrayWithDestroy, addObservablesTo, addComputablesTo, addSubscribablesTo } from 'External/ko';
|
||||
|
||||
import { UNUSED_OPTION_VALUE } from 'Common/Consts';
|
||||
import { folderInformation, messagesDeleteHelper } from 'Common/Folders';
|
||||
import { folderInformation } from 'Common/Folders';
|
||||
import { serverRequest } from 'Common/Links';
|
||||
import { i18n, getNotification, getUploadErrorDescByCode, timestampToString } from 'Common/Translator';
|
||||
import { setFolderETag } from 'Common/Cache';
|
||||
|
|
@ -586,8 +586,7 @@ export class ComposePopupView extends AbstractViewPopup {
|
|||
const
|
||||
sFromFolderFullName = this.draftsFolder(),
|
||||
oUids = new Set([this.draftUid()]);
|
||||
messagesDeleteHelper(sFromFolderFullName, oUids);
|
||||
MessagelistUserStore.removeMessagesFromList(sFromFolderFullName, oUids);
|
||||
MessagelistUserStore.moveMessages(sFromFolderFullName, oUids);
|
||||
this.close();
|
||||
}
|
||||
]);
|
||||
|
|
|
|||
|
|
@ -20,8 +20,6 @@ import { FolderCreatePopupView } from 'View/Popup/FolderCreate';
|
|||
import { ContactsPopupView } from 'View/Popup/Contacts';
|
||||
import { ComposePopupView } from 'View/Popup/Compose';
|
||||
|
||||
import { moveMessagesToFolder } from 'Common/Folders';
|
||||
|
||||
import { setExpandedFolder, foldersFilter } from 'Model/FolderCollection';
|
||||
|
||||
export class MailFolderList extends AbstractViewLeft {
|
||||
|
|
@ -92,7 +90,7 @@ export class MailFolderList extends AbstractViewLeft {
|
|||
if (folder) {
|
||||
if (moveAction()) {
|
||||
moveAction(false);
|
||||
moveMessagesToFolder(
|
||||
MessagelistUserStore.moveMessages(
|
||||
FolderUserStore.currentFolderFullName(),
|
||||
MessagelistUserStore.listCheckedOrSelectedUidsWithSubMails(),
|
||||
folder.fullName,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue