diff options
author | Daniel Schaal <daniel@schaal.email> | 2017-06-08 05:10:34 +0200 |
---|---|---|
committer | Daniel Schaal <daniel@schaal.email> | 2017-06-10 11:19:07 +0200 |
commit | 7cebc63defdd640b822132a1e24b489345ac06e9 (patch) | |
tree | 34fb03b39d0a2a472aae12f0c7eae2454834f63d /js/service/FeedResource.js | |
parent | 2eddf6242be77e21a4a9d05b56dc9cc0125472c3 (diff) |
Use regular promise for http calls
Diffstat (limited to 'js/service/FeedResource.js')
-rw-r--r-- | js/service/FeedResource.js | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/js/service/FeedResource.js b/js/service/FeedResource.js index 3e138a952..bb1f30f3f 100644 --- a/js/service/FeedResource.js +++ b/js/service/FeedResource.js @@ -184,9 +184,7 @@ app.factory('FeedResource', function (Resource, $http, BASE_URL, $q) { this.add(feed); this.updateFolderCache(); - var deferred = this.$q.defer(); - - this.http({ + return this.http({ method: 'POST', url: this.BASE_URL + '/feeds', data: { @@ -196,15 +194,12 @@ app.factory('FeedResource', function (Resource, $http, BASE_URL, $q) { user: user || null, password: password || null } - }).success(function (data) { - deferred.resolve(data); - }).error(function (data) { + }).then(function (response) { + return response.data; + }, function (response) { feed.faviconLink = ''; - feed.error = data.message; - deferred.reject(); + feed.error = response.data.message; }); - - return deferred.promise; }; |