From d275134f262b882ee3c9c96fd4bec8ce93524c77 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Mon, 22 Mar 2021 07:50:56 +0300 Subject: unify return values for getPreviousFeed and usages of both prev/next --- js/App.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'js/App.js') diff --git a/js/App.js b/js/App.js index a9d796968..a9da8a1c0 100644 --- a/js/App.js +++ b/js/App.js @@ -938,16 +938,16 @@ const App = { } else { this.hotkey_actions["next_feed"] = () => { - const rv = dijit.byId("feedTree").getNextFeed( + const [feed, is_cat] = Feeds.getNextFeed( Feeds.getActive(), Feeds.activeIsCat()); - if (rv) Feeds.open({feed: rv[0], is_cat: rv[1], delayed: true}) + Feeds.open({feed: feed, is_cat: is_cat, delayed: true}) }; this.hotkey_actions["prev_feed"] = () => { - const rv = dijit.byId("feedTree").getPreviousFeed( + const [feed, is_cat] = Feeds.getPreviousFeed( Feeds.getActive(), Feeds.activeIsCat()); - if (rv) Feeds.open({feed: rv[0], is_cat: rv[1], delayed: true}) + Feeds.open({feed: feed, is_cat: is_cat, delayed: true}) }; this.hotkey_actions["next_article_or_scroll"] = (event) => { if (this.isCombinedMode()) -- cgit v1.2.3