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

(fix) Draft initialization

pull/95/merge
Francis Lachapelle 2015-08-04 10:56:55 -04:00
parent 6d260c58c7
commit ff1b9e7ed1
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
UI/WebServerResources/js/Mailer/Message.service.js
View File

@ -246,19 +246,16 @@
* @returns the HTML representation of the body
*/
Message.prototype.$editableContent = function() {
var _this = this,
deferred = Message.$q.defer();
var _this = this;
Message.$$resource.fetch(this.id, 'edit').then(function(data) {
return Message.$$resource.fetch(this.id, 'edit').then(function(data) {
angular.extend(_this, data);
Message.$$resource.fetch(_this.$absolutePath({asDraft: true}), 'edit').then(function(data) {
return Message.$$resource.fetch(_this.$absolutePath({asDraft: true}), 'edit').then(function(data) {
Message.$log.debug('editable = ' + JSON.stringify(data, undefined, 2));
angular.extend(_this.editable, data);
deferred.resolve(data.text);
}, deferred.reject);
}, deferred.reject);
return deferred.promise;
return data.text;
});
});
};
/**

5
UI/WebServerResources/js/Mailer/MessageController.js
View File

@ -77,8 +77,9 @@
}
function edit($event) {
var message = vm.message.$editableContent();
showMailEditor($event, message);
vm.message.$editableContent().then(function() {
showMailEditor($event, vm.message);
});
}
}