also delete feeds when their parent folder is being deleted

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) {