amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-05-22 11:55:24 +00:00
Code Issues Projects Releases Wiki Activity

(js,css) Improve handling of attachments in editor

Browse Source
This commit is contained in:
Francis Lachapelle
2015-12-01 16:09:29 -05:00
parent 0660db7bf6
commit 5bb6cea09e
3 changed files with 81 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UI/WebServerResources/js/Mailer/MessageEditorController.js
+43 -11
View File
@@ -6,8 +6,8 @@
/**
* @ngInject
*/
MessageEditorController.$inject = ['$stateParams', '$mdDialog', '$mdToast', 'FileUploader', 'stateAccounts', 'stateMessage', 'stateRecipients', '$timeout', 'sgFocus', 'Dialog', 'AddressBook', 'Preferences'];
function MessageEditorController($stateParams, $mdDialog, $mdToast, FileUploader, stateAccounts, stateMessage, stateRecipients, $timeout, focus, Dialog, AddressBook, Preferences) {
MessageEditorController.$inject = ['$stateParams', '$mdDialog', '$mdToast', 'FileUploader', 'stateAccounts', 'stateMessage', 'stateRecipients', '$timeout', 'Dialog', 'AddressBook', 'Preferences'];
function MessageEditorController($stateParams, $mdDialog, $mdToast, FileUploader, stateAccounts, stateMessage, stateRecipients, $timeout, Dialog, AddressBook, Preferences) {
var vm = this;
vm.addRecipient = addRecipient;
@@ -18,29 +18,30 @@
vm.hideBcc = true;
vm.cancel = cancel;
vm.send = send;
vm.removeAttachment = removeAttachment;
vm.contactFilter = contactFilter;
vm.identities = _.pluck(_.flatten(_.pluck(stateAccounts, 'identities')), 'full');
vm.uploader = new FileUploader({
url: stateMessage.$absolutePath({asDraft: true}) + '/save',
autoUpload: true,
alias: 'attachments',
onProgressItem: function(item, progress) {
console.debug(item); console.debug(progress);
},
removeAfterUpload: false,
// onProgressItem: function(item, progress) {
// console.debug(item); console.debug(progress);
// },
onSuccessItem: function(item, response, status, headers) {
stateMessage.$setUID(response.uid);
stateMessage.$reload();
console.debug(item); console.debug('success = ' + JSON.stringify(response, undefined, 2));
stateMessage.$reload({asDraft: false});
//console.debug(item); console.debug('success = ' + JSON.stringify(response, undefined, 2));
},
onCancelItem: function(item, response, status, headers) {
console.debug(item); console.debug('cancel = ' + JSON.stringify(response, undefined, 2));
//console.debug(item); console.debug('cancel = ' + JSON.stringify(response, undefined, 2));
// We remove the attachment
stateMessage.$deleteAttachment(item.file.name);
this.removeFromQueue(item);
},
onErrorItem: function(item, response, status, headers) {
console.debug(item); console.debug('error = ' + JSON.stringify(response, undefined, 2));
//console.debug(item); console.debug('error = ' + JSON.stringify(response, undefined, 2));
}
});
@@ -61,16 +62,45 @@
else if ($stateParams.actionName == 'forward') {
stateMessage.$forward().then(function(msgObject) {
vm.message = msgObject;
addAttachments();
});
}
else if (angular.isDefined(stateMessage)) {
vm.message = stateMessage;
addAttachments();
}
if (angular.isDefined(stateRecipients)) {
vm.message.editable.to = _.union(vm.message.editable.to, _.pluck(stateRecipients, 'full'));
}
function addAttachments() {
// Add existing attached files to uploader
var i, data, fileItem;
if (vm.message.attachmentAttrs)
for (i = 0; i < vm.message.attachmentAttrs.length; i++) {
data = {
name: vm.message.attachmentAttrs[i].filename,
type: vm.message.attachmentAttrs[i].mimetype,
size: parseInt(vm.message.attachmentAttrs[i].size)
};
fileItem = new FileUploader.FileItem(vm.uploader, data);
fileItem.progress = 100;
fileItem.isUploaded = true;
fileItem.isSuccess = true;
vm.uploader.queue.push(fileItem);
}
}
function removeAttachment(item) {
if (item.isUploading)
vm.uploader.cancelItem(item);
else {
vm.message.$deleteAttachment(item.file.name);
item.remove();
}
}
function cancel() {
// TODO: delete draft?
if (vm.autosave)
@@ -126,10 +156,12 @@
vm.autosave = $timeout(vm.autosaveDrafts, Preferences.defaults.SOGoMailAutoSave*1000*60);
}
// Select list based on user's settings
// Read user's defaults
Preferences.ready().then(function() {
if (Preferences.defaults.SOGoMailAutoSave)
// Enable auto-save of draft
vm.autosave = $timeout(vm.autosaveDrafts, Preferences.defaults.SOGoMailAutoSave*1000*60);
// Set the locale of CKEditor
vm.localeCode = Preferences.defaults.LocaleCode;
});
}