diff --git a/assets/javascripts/app.js b/assets/javascripts/app.js index bc16885..7b8f129 100644 --- a/assets/javascripts/app.js +++ b/assets/javascripts/app.js @@ -126,11 +126,11 @@ var vm = new Vue({ }, data: function() { return { - 'filterSelected': null, + 'filterSelected': undefined, 'folders': [], 'feeds': [], - 'feedSelected': null, - 'feedListWidth': null, + 'feedSelected': undefined, + 'feedListWidth': undefined, 'feedNewChoice': [], 'feedNewChoiceSelected': '', 'items': [], @@ -142,8 +142,8 @@ var vm = new Vue({ 'itemSelectedDetails': {}, 'itemSelectedReadability': '', 'itemSearch': '', - 'itemSortNewestFirst': null, - 'itemListWidth': null, + 'itemSortNewestFirst': undefined, + 'itemListWidth': undefined, 'filteredFeedStats': {}, 'filteredFolderStats': {}, @@ -229,13 +229,13 @@ var vm = new Vue({ }, 500), }, 'filterSelected': function(newVal, oldVal) { - if (oldVal === null) return // do nothing, initial setup + if (oldVal === undefined) return // do nothing, initial setup api.settings.update({filter: newVal}).then(this.refreshItems.bind(this)) this.itemSelected = null this.computeStats() }, 'feedSelected': function(newVal, oldVal) { - if (oldVal === null) return // do nothing, initial setup + if (oldVal === undefined) return // do nothing, initial setup api.settings.update({feed: newVal}).then(this.refreshItems.bind(this)) this.itemSelected = null if (this.$refs.itemlist) this.$refs.itemlist.scrollTop = 0 @@ -259,15 +259,15 @@ var vm = new Vue({ this.refreshItems() }, 500), 'itemSortNewestFirst': function(newVal, oldVal) { - if (oldVal === null) return + if (oldVal === undefined) return // do nothing, initial setup api.settings.update({sort_newest_first: newVal}).then(this.refreshItems.bind(this)) }, 'feedListWidth': debounce(function(newVal, oldVal) { - if (oldVal === null) return + if (oldVal === undefined) return // do nothing, initial setup api.settings.update({feed_list_width: newVal}) }, 1000), 'itemListWidth': debounce(function(newVal, oldVal) { - if (oldVal === null) return + if (oldVal === undefined) return // do nothing, initial setup api.settings.update({item_list_width: newVal}) }, 1000), }, @@ -318,6 +318,11 @@ var vm = new Vue({ }) }, refreshItems: function() { + if (this.feedSelected === null) { + vm.items = [] + vm.itemsPage = {'cur': 1, 'num': 1} + return + } var query = this.getItemsQuery() this.loading.items = true return api.items.list(query).then(function(data) {