summaryrefslogtreecommitdiffstats
path: root/js/service/FeedResource.js
diff options
context:
space:
mode:
Diffstat (limited to 'js/service/FeedResource.js')
-rw-r--r--js/service/FeedResource.js13
1 files changed, 11 insertions, 2 deletions
diff --git a/js/service/FeedResource.js b/js/service/FeedResource.js
index 180ba0db7..18a50a41b 100644
--- a/js/service/FeedResource.js
+++ b/js/service/FeedResource.js
@@ -227,11 +227,15 @@ app.factory('FeedResource', function (Resource, $http, BASE_URL, $q) {
FeedResource.prototype.reversiblyDeleteFolder = function (folderId) {
var self = this;
+ var promises = [];
this.getByFolderId(folderId).forEach(function (feed) {
- self.reversiblyDelete(feed.id, false);
+ promises.push(self.reversiblyDelete(feed.id, false));
});
this.updateUnreadCache();
+
+ var deferred = this.$q.all(promises);
+ return deferred.promise;
};
@@ -280,11 +284,16 @@ app.factory('FeedResource', function (Resource, $http, BASE_URL, $q) {
FeedResource.prototype.undoDeleteFolder = function (folderId) {
var self = this;
+ var promises = [];
+
this.getByFolderId(folderId).forEach(function (feed) {
- self.undoDelete(feed.id, false);
+ promises.push(self.undoDelete(feed.id, false));
});
this.updateUnreadCache();
+
+ var deferred = this.$q.all(promises);
+ return deferred.promise;
};