From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Tue, 19 Mar 2013 16:29:20 +0000 (+0400)
Subject: add little loading indicator for feed categories
X-Git-Tag: 1.7.5~98
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=6cf60c881fbad073b26a236f5659cdae7767ae10;p=tt-rss.git

add little loading indicator for feed categories
---

diff --git a/js/FeedTree.js b/js/FeedTree.js
index 0b75629f..b02d8ad7 100644
--- a/js/FeedTree.js
+++ b/js/FeedTree.js
@@ -162,6 +162,13 @@ dojo.declare("fox.FeedTree", dijit.Tree, {
 			tnode._menu = menu;
 		}
 
+		if (id.match("CAT:")) {
+			loading = dojo.doc.createElement('img');
+			loading.className = 'loadingNode';
+			dojo.place(loading, tnode.labelNode, 'after');
+			tnode.loadingNode = loading;
+		}
+
 		if (id.match("CAT:") && bare_id == -1) {
 			var menu = new dijit.Menu();
 			menu.row_id = bare_id;
@@ -243,8 +250,15 @@ dojo.declare("fox.FeedTree", dijit.Tree, {
 
 		if (treeNode) {
 			treeNode = treeNode[0];
-			treeNode.expandoNode.src = src;
-			return true;
+			if (is_cat) {
+				if (treeNode.loadingNode) {
+					treeNode.loadingNode.src = src;
+					return true;
+				}
+			} else {
+				treeNode.expandoNode.src = src;
+				return true;
+			}
 		}
 
 		return false;
diff --git a/js/feedlist.js b/js/feedlist.js
index 4dc8b503..ae4c3a2f 100644
--- a/js/feedlist.js
+++ b/js/feedlist.js
@@ -125,13 +125,11 @@ function viewfeed(feed, method, is_cat, offset, background, infscroll_req) {
 
 			Form.enable("main_toolbar_form");
 
-			if (!offset)
-				if (!is_cat) {
-					if (!setFeedExpandoIcon(feed, is_cat, 'images/indicator_white.gif'))
-						notify_progress("Loading, please wait...", true);
-				} else {
+			if (!offset) {
+				if (!setFeedExpandoIcon(feed, is_cat,
+							(is_cat) ? 'images/indicator_tiny.gif' : 'images/indicator_white.gif'))
 					notify_progress("Loading, please wait...", true);
-				}
+			}
 		}
 
 		query += "&cat=" + is_cat;