From dfc0d23fa791f17a090b9253364e96931d206fa3 Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Wed, 10 Feb 2016 16:40:38 -0500 Subject: [PATCH] (js) Remove deferred promise --- UI/WebServerResources/js/Mailer/Message.service.js | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/UI/WebServerResources/js/Mailer/Message.service.js b/UI/WebServerResources/js/Mailer/Message.service.js index 2d1933b5c..d43e8bd85 100644 --- a/UI/WebServerResources/js/Mailer/Message.service.js +++ b/UI/WebServerResources/js/Mailer/Message.service.js @@ -585,27 +585,24 @@ */ Message.prototype.$send = function() { var _this = this, - data = angular.copy(this.editable), - deferred = Message.$q.defer(); + data = angular.copy(this.editable); Message.$log.debug('send = ' + JSON.stringify(data, undefined, 2)); - Message.$$resource.post(this.$absolutePath({asDraft: true}), 'send', data).then(function(data) { + return Message.$$resource.post(this.$absolutePath({asDraft: true}), 'send', data).then(function(data) { if (data.status == 'success') { - deferred.resolve(data); if (angular.isDefined(_this.origin)) { if (_this.origin.action.startsWith('reply')) _this.origin.message.isanswered = true; else if (_this.origin.action == 'forward') _this.origin.message.isforwarded = true; } + return data; } else { - deferred.reject(data); + return Message.$q.reject(data); } }); - - return deferred.promise; }; /**