From 54c2a6458db4d39819c5e89b2c4f52c1d2e077ab Mon Sep 17 00:00:00 2001 From: Nazar Kanaev Date: Sun, 18 Oct 2020 15:40:06 +0100 Subject: [PATCH] fix deleting feeds --- assets/javascripts/app.js | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/assets/javascripts/app.js b/assets/javascripts/app.js index 0b73d52..422233f 100644 --- a/assets/javascripts/app.js +++ b/assets/javascripts/app.js @@ -430,16 +430,10 @@ var vm = new Vue({ deleteFeed: function(feed) { if (confirm('Are you sure you want to delete ' + feed.title + '?')) { api.feeds.delete(feed.id).then(function() { - // note: if item list contains delete feed's entries, refresh it first. - for (var i = 0; i < vm.items.length; i++) { - if (vm.items[i].feed_id == feed.id) { - vm.refreshItems().then(function() { - vm.refreshStats() - vm.refreshFeeds() - }) - return - } - } + // unselect feed to prevent reading properties of null in template + var isSelected = (vm.feedSelected === 'feed:'+feed.id + || (feed.folder_id && vm.feedSelected === 'folder:'+feed.folder_id)); + if (isSelected) vm.feedSelected = null vm.refreshStats() vm.refreshFeeds()