Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-08-28 19:49:20 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Improved Jua uploader

Browse source
This commit is contained in:
djmaze 2021-09-14 12:50:56 +02:00
parent 2cb73643ca
commit 9e28eb5fc7
5 changed files with 45 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1096,9 +1096,6 @@ class ComposePopupView extends AbstractViewPopup {
attachmentSizeLimit = pInt(SettingsGet('AttachmentLimit')),
oJua = new Jua({
action: serverRequest('Upload'),
name: 'uploader',
queueSize: 2,
multipleSizeLimit: 50,
clickElement: this.composeUploaderButton(),
dragAndDropElement: this.composeUploaderDropPlace()
});
@ -1176,23 +1173,24 @@ class ComposePopupView extends AbstractViewPopup {
})
.on('onComplete', (id, result, data) => {
const attachment = this.getAttachmentById(id),
errorCode = data && data.Result && data.Result.ErrorCode ? data.Result.ErrorCode : null,
attachmentJson = result && data && data.Result && data.Result.Attachment ? data.Result.Attachment : null;
response = (data && data.Result) || {},
errorCode = response.ErrorCode,
attachmentJson = result && response.Attachment;
let error = '';
if (null !== errorCode) {
if (null != errorCode) {
error = getUploadErrorDescByCode(errorCode);
} else if (!attachmentJson) {
error = i18n('UPLOAD/ERROR_UNKNOWN');
}
if (attachment) {
if (error && error.length) {
if (error) {
attachment
.waiting(false)
.uploading(false)
.complete(true)
.error(error);
.error(error + '\n' + response.ErrorMessage);
} else if (attachmentJson) {
attachment
.waiting(false)

5
dev/View/Popup/Contacts.js
View file

@ -472,10 +472,7 @@ class ContactsPopupView extends AbstractViewPopup {
if (this.importUploaderButton()) {
const j = new Jua({
action: serverRequest('UploadContacts'),
name: 'uploader',
queueSize: 1,
multipleSizeLimit: 1,
disableMultiple: true,
limit: 1,
disableDocumentDropPrevent: true,
clickElement: this.importUploaderButton()
});

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

@ -720,8 +720,7 @@ export class MessageListMailBoxUserView extends AbstractViewRight {
const oJua = new Jua({
action: serverRequest('Append'),
name: 'AppendFile',
queueSize: 1,
multipleSizeLimit: 1,
limit: 1,
hidden: {
Folder: () => FolderUserStore.currentFolderFullNameRaw()
},