From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Thu, 28 Feb 2013 15:16:17 +0000 (+0400)
Subject: assign hash-stored feed_id/is_cat earlier on startup
X-Git-Tag: 1.7.1~9
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=4480b26e66c2438ad050668f86a2519ae5722b04;p=tt-rss.git

assign hash-stored feed_id/is_cat earlier on startup
---

diff --git a/js/tt-rss.js b/js/tt-rss.js
index eb0ec664..054ccf3d 100644
--- a/js/tt-rss.js
+++ b/js/tt-rss.js
@@ -100,13 +100,6 @@ function updateFeedList() {
 	   	dojo.disconnect(tmph);
 			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();
 
 //			var node = dijit.byId("feedTree")._itemNodesMap['FEED:-2'][0].domNode
@@ -290,6 +283,13 @@ function init_second_stage() {
 
 		feeds_sort_by_unread = getInitParam("feeds_sort_by_unread") == 1;
 
+		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);
+		}
+
 		loading_set_progress(30);
 
 		// can't use cache_clear() here because viewfeed might not have initialized yet