opensourcemirror
/
tinytinyrss
mirror of https://git.tt-rss.org/fox/tt-rss.git
1
0
Fork 0
Code Issues Releases Wiki Activity

* Feeds.openNextUnread: fix 

* model.getNextFeed: make sure return values are consistent, stop
wrapping back to starred
This commit is contained in:
Andrew Dolgov 2021-03-22 07:39:31 +03:00
parent 43744412f4
commit 2e6d48ead7
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
js/FeedTree.js
View File

@ -394,7 +394,7 @@ define(["dojo/_base/declare", "dojo/dom-construct", "dojo/_base/array", "dojo/co
} }
const items = this.model.store._arrayOfAllItems; const items = this.model.store._arrayOfAllItems;
let item = items[0]; let item = false;
for (let i = 0; i < items.length; i++) { for (let i = 0; i < items.length; i++) {
if (items[i] == treeItem) { if (items[i] == treeItem) {
@ -422,7 +422,7 @@ define(["dojo/_base/declare", "dojo/dom-construct", "dojo/_base/array", "dojo/co
return [this.model.store.getValue(item, 'bare_id'), return [this.model.store.getValue(item, 'bare_id'),
!this.model.store.getValue(item, 'id').match('FEED:')]; !this.model.store.getValue(item, 'id').match('FEED:')];
} else { } else {
return false; return [false, false];
} }
}, },
getPreviousFeed: function (feed, is_cat) { getPreviousFeed: function (feed, is_cat) {

7
js/Feeds.js
View File

@ -133,9 +133,10 @@ const Feeds = {
return Feeds.reloadCurrent(''); return Feeds.reloadCurrent('');
}, },
openNextUnread: function() { openNextUnread: function() {
const is_cat = this.activeIsCat(); const [feed, is_cat] = this.getNextUnread(this.getActive(), this.activeIsCat());
const nuf = this.getNextUnread(this.getActive(), is_cat);
if (nuf) this.open({feed: nuf, is_cat: is_cat}); if (feed !== false)
this.open({feed: feed, is_cat: is_cat});
}, },
toggle: function() { toggle: function() {
Element.toggle("feeds-holder"); Element.toggle("feeds-holder");