viewfeed: select News tab and display loading prompt when necessary

1 files changed, 7 insertions, 1 deletions

diff --git a/feedlist.js b/feedlist.js
index bfcb943ab..67875a0ec 100644
--- a/feedlist.js
+++ b/feedlist.js
@@ -64,6 +64,9 @@ function viewfeed(feed, subop, is_cat, offset) {
 			}		
 		} */
 
+		dijit.byId("content-tabs").selectChild(
+			dijit.byId("content-tabs").getChildren()[0]);
+
 		var force_nocache = false;
 
 		var page_offset = 0;
@@ -225,7 +228,8 @@ function viewfeed(feed, subop, is_cat, offset) {
 		} else {
 
 			if (!is_cat)
-				setFeedExpandoIcon(feed, is_cat, 'images/indicator_white.gif');
+				if (!setFeedExpandoIcon(feed, is_cat, 'images/indicator_white.gif'))
+					notify_progress("Loading, please wait...", true);
 
 			new Ajax.Request("backend.php", {
 				parameters: query,
@@ -869,9 +873,11 @@ function setFeedExpandoIcon(feed, is_cat, src) {
 		if (treeNode) {
 			treeNode = treeNode[0];
 			treeNode.expandoNode.src = src;
+			return true;
 		}
 
 	} catch (e) {
 		exception_error("setFeedIcon", e);
 	}
+	return false;
 }