valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

restore feed from URL hash after feedlist init

This commit is contained in:
Andrew Dolgov 2019-05-06 21:57:58 +03:00
parent 6479c07324
commit 9368f1a07f
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
js/Feeds.js
View File

@ -203,10 +203,13 @@ define(["dojo/_base/declare"], function (declare) {
document.onkeypress = (event) => { return App.hotkeyHandler(event) };
window.onresize = () => { Headlines.scrollHandler(); }
if (!this.getActive()) {
this.open({feed: -3});
const hash_feed_id = hash_get('f');
const hash_feed_is_cat = hash_get('c') == "1";
if (hash_feed_id != undefined) {
this.open({feed: hash_feed_id, is_cat: hash_feed_is_cat});
} else {
this.open({feed: this.getActive(), is_cat: this.activeIsCat()});
this.open({feed: -3});
}
this.hideOrShowFeeds(App.getInitParam("hide_read_feeds") == 1);
@ -250,6 +253,8 @@ define(["dojo/_base/declare"], function (declare) {
return this._active_feed_id;
},
setActive: function(id, is_cat) {
console.log('setActive', id, is_cat);
hash_set('f', id);
hash_set('c', is_cat ? 1 : 0);

7
js/tt-rss.js
View File

@ -148,13 +148,6 @@ require(["dojo/_base/kernel",
dijit.getEnclosingWidget(toolbar.order_by).attr('value',
App.getInitParam("default_view_order_by"));
const hash_feed_id = hash_get('f');
const hash_feed_is_cat = hash_get('c') == "1";
if (hash_feed_id != undefined) {
Feeds.setActive(hash_feed_id, hash_feed_is_cat);
}
App.setLoadingProgress(50);
this._widescreen_mode = App.getInitParam("widescreen");