summaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2021-02-21 16:06:57 +0300
committerAndrew Dolgov <[email protected]>2021-02-21 16:06:57 +0300
commitc6b7a7f8d0eaeb11f76dbc70714d740eeac180f1 (patch)
tree8e19cb866c988702d8ffe9c1c0c6db72b9ac8d03 /js
parent2ab215daca1914102b35897300d681b3eb7f1274 (diff)
parentd0efa35d2232ad9d3770ad8369d8af388509fe0c (diff)
Merge branch 'master' of git.tt-rss.org:fox/tt-rss
Diffstat (limited to 'js')
-rw-r--r--js/CommonDialogs.js2
-rw-r--r--js/Feeds.js6
2 files changed, 6 insertions, 2 deletions
diff --git a/js/CommonDialogs.js b/js/CommonDialogs.js
index 704e797d3..a100a546d 100644
--- a/js/CommonDialogs.js
+++ b/js/CommonDialogs.js
@@ -312,7 +312,7 @@ const CommonDialogs = {
} else {
if (feed_id == Feeds.getActive())
setTimeout(() => {
- Feeds.open({feed: -5})
+ Feeds.openDefaultFeed();
},
100);
diff --git a/js/Feeds.js b/js/Feeds.js
index e9ac5328d..4841fd0df 100644
--- a/js/Feeds.js
+++ b/js/Feeds.js
@@ -3,6 +3,7 @@
/* global __, App, Headlines, xhrPost, xhr, dojo, dijit, fox, PluginHost, Notify, fox */
const Feeds = {
+ _default_feed_id: -3,
counters_last_request: 0,
_active_feed_id: undefined,
_active_feed_is_cat: false,
@@ -109,6 +110,9 @@ const Feeds = {
}
return false; // block unneeded form submits
},
+ openDefaultFeed: function() {
+ this.open({feed: this._default_feed_id});
+ },
openNextUnread: function() {
const is_cat = this.activeIsCat();
const nuf = this.getNextUnread(this.getActive(), is_cat);
@@ -215,7 +219,7 @@ const Feeds = {
if (hash_feed_id != undefined) {
this.open({feed: hash_feed_id, is_cat: hash_feed_is_cat});
} else {
- this.open({feed: -3});
+ this.openDefaultFeed();
}
this.hideOrShowFeeds(App.getInitParam("hide_read_feeds"));