diff options
author | Bernhard Posselt <dev@bernhard-posselt.com> | 2014-09-13 04:43:37 +0200 |
---|---|---|
committer | Bernhard Posselt <dev@bernhard-posselt.com> | 2014-09-13 04:43:37 +0200 |
commit | 1cb7d9ad1f47c4fce59dad43cc88568524ebc974 (patch) | |
tree | 72fba09f2a9a3ec062238b72b64adca96c3a411b /js/controller/NavigationController.js | |
parent | 5f43cd596f95fb1606d51d64b511a12f14e5c064 (diff) |
also delete feeds when their parent folder is being deleted
Diffstat (limited to 'js/controller/NavigationController.js')
-rw-r--r-- | js/controller/NavigationController.js | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/js/controller/NavigationController.js b/js/controller/NavigationController.js index 4cd7a4400..697bd05d4 100644 --- a/js/controller/NavigationController.js +++ b/js/controller/NavigationController.js @@ -256,6 +256,7 @@ function ($route, FEED_TYPE, FeedResource, FolderResource, ItemResource, self._deletedFeedsBackup[folder.name] || []; self._deletedFeedsBackup[folder.name].push(feed); FeedResource.delete(feed.url); + self.reversiblyDeleteFeed(feed); }); FolderResource.reversiblyDelete(folder.id); @@ -266,10 +267,14 @@ function ($route, FEED_TYPE, FeedResource, FolderResource, ItemResource, var deletedFeeds = this._deletedFeedsBackup[folder.name]; if (deletedFeeds !== undefined) { + deletedFeeds.forEach(function (feed) { + self.undoDeleteFeed(feed); + }); FeedResource.receive(deletedFeeds); } FolderResource.undoDelete(folder.id); + delete this._deletedFeedsBackup[folder.name]; }; this.deleteFolder = function (folder) { |