LupusNobilis
/
sogo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Initialize arrays of new message instance

pull/91/head
Francis Lachapelle 2015-04-18 08:50:06 -04:00
parent 6971632165
commit b141031ccd
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
UI/WebServerResources/js/Mailer/account-model.js
View File

@ -200,7 +200,7 @@
// Fetch draft initial data
Account.$$resource.fetch(message.$absolutePath({asDraft: true}), 'edit').then(function(data) {
Account.$log.debug('New message: ' + JSON.stringify(data, undefined, 2));
message.editable = data;
angular.extend(message.editable, data);
deferred.resolve(message);
}, function(data) {
deferred.reject(data);

5
UI/WebServerResources/js/Mailer/message-model.js
View File

@ -15,6 +15,7 @@
this.$mailbox = mailbox;
this.$hasUnsafeContent = false;
this.$loadUnsafeContent = false;
this.editable = {to: [], cc: [], bcc: []};
// Data is immediately available
if (typeof futureMessageData.then !== 'function') {
//console.debug(JSON.stringify(futureMessageData, undefined, 2));
@ -184,7 +185,7 @@
angular.extend(_this, data);
Message.$$resource.fetch(_this.$absolutePath({asDraft: true}), 'edit').then(function(data) {
Message.$log.debug('editable = ' + JSON.stringify(data, undefined, 2));
_this.editable = data;
angular.extend(_this.editable, data);
deferred.resolve(data.text);
}, deferred.reject);
}, deferred.reject);
@ -263,7 +264,7 @@
// Fetch draft initial data
Message.$$resource.fetch(message.$absolutePath({asDraft: true}), 'edit').then(function(data) {
Message.$log.debug('New ' + action + ': ' + JSON.stringify(data, undefined, 2));
message.editable = data;
angular.extend(message.editable, data);
deferred.resolve(message);
}, function(data) {
deferred.reject(data);