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

only use hash feed/cat parameters on startup

This commit is contained in:
Andrew Dolgov 2013-02-28 15:56:22 +04:00
parent 2bee32ffa7
commit 535a4c7d16
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
js/tt-rss.js
View File

@ -3,6 +3,8 @@ var hotkey_prefix = false;
var hotkey_prefix_pressed = false; var hotkey_prefix_pressed = false;
var _widescreen_mode = false; var _widescreen_mode = false;
var _rpc_seq = 0; var _rpc_seq = 0;
var _active_feed_id = 0;
var _active_feed_is_cat = false;
function next_seq() { function next_seq() {
_rpc_seq += 1; _rpc_seq += 1;
@ -14,12 +16,12 @@ function get_seq() {
} }
function activeFeedIsCat() { function activeFeedIsCat() {
return hash_get('c') == "1"; return _active_feed_is_cat;
} }
function getActiveFeedId() { function getActiveFeedId() {
try { try {
return hash_get('f'); return _active_feed_id;
} catch (e) { } catch (e) {
exception_error("getActiveFeedId", e); exception_error("getActiveFeedId", e);
} }
@ -30,6 +32,9 @@ function setActiveFeedId(id, is_cat) {
hash_set('f', id); hash_set('f', id);
hash_set('c', is_cat ? 1 : 0); hash_set('c', is_cat ? 1 : 0);
_active_feed_id = id;
_active_feed_is_cat = is_cat;
selectFeed(id, is_cat); selectFeed(id, is_cat);
} catch (e) { } catch (e) {
exception_error("setActiveFeedId", e); exception_error("setActiveFeedId", e);
@ -95,6 +100,13 @@ function updateFeedList() {
dojo.disconnect(tmph); dojo.disconnect(tmph);
Element.hide("feedlistLoading"); Element.hide("feedlistLoading");
var hash_feed_id = hash_get('f');
var hash_feed_is_cat = hash_get('c') == "1";
if (hash_feed_id != undefined) {
setActiveFeedId(hash_feed_id, hash_feed_is_cat);
}
feedlist_init(); feedlist_init();
// var node = dijit.byId("feedTree")._itemNodesMap['FEED:-2'][0].domNode // var node = dijit.byId("feedTree")._itemNodesMap['FEED:-2'][0].domNode