Merge branch 'master' of github.com:gothfox/Tiny-Tiny-RSS

1 files changed, 6 insertions, 18 deletions

diff --git a/feedlist.js b/feedlist.js
index 4f1a56c2a..62c44b494 100644
--- a/feedlist.js
+++ b/feedlist.js
@@ -48,7 +48,7 @@ function loadMoreHeadlines() {
 }
 
 
-function viewfeed(feed, subop, is_cat, offset, background, infscrol_req) {
+function viewfeed(feed, subop, is_cat, offset, background, infscroll_req) {
 	try {
 		if (is_cat == undefined)
 			is_cat = false;
@@ -58,7 +58,7 @@ function viewfeed(feed, subop, is_cat, offset, background, infscrol_req) {
 		if (subop == undefined) subop = '';
 		if (offset == undefined) offset = 0;
 		if (background == undefined) background = false;
-		if (infscrol_req == undefined) infscrol_req = false;
+		if (infscroll_req == undefined) infscroll_req = false;
 
 		last_requested_article = 0;
 
@@ -100,12 +100,10 @@ function viewfeed(feed, subop, is_cat, offset, background, infscrol_req) {
 			}
 		}
 
-		if (offset == 0)
+		if (offset == 0 && !background)
 			dijit.byId("content-tabs").selectChild(
 				dijit.byId("content-tabs").getChildren()[0]);
 
-		var force_nocache = false;
-
 		if (!background) {
 			if (getActiveFeedId() != feed || offset == 0) {
 				active_post_id = 0;
@@ -211,7 +209,7 @@ function viewfeed(feed, subop, is_cat, offset, background, infscrol_req) {
 			parameters: query,
 			onComplete: function(transport) {
 				setFeedExpandoIcon(feed, is_cat, 'images/blank_icon.gif');
-				headlines_callback2(transport, offset, background, infscrol_req);
+				headlines_callback2(transport, offset, background, infscroll_req);
 			} });
 
 	} catch (e) {
@@ -312,18 +310,14 @@ function displayNewContentPrompt(id) {
 
 function parse_counters(elems, scheduled_call) {
 	try {
-
-		var feeds_found = 0;
-
 		for (var l = 0; l < elems.length; l++) {
 
-			var id = elems[l].id
+			var id = elems[l].id;
 			var kind = elems[l].kind;
-			var ctr = parseInt(elems[l].counter)
+			var ctr = parseInt(elems[l].counter);
 			var error = elems[l].error;
 			var has_img = elems[l].has_img;
 			var updated = elems[l].updated;
-			var title = elems[l].title;
 
 			if (id == "global-unread") {
 				global_unread = ctr;
@@ -336,8 +330,6 @@ function parse_counters(elems, scheduled_call) {
 				continue;
 			}
 
-			var treeItem;
-
 			// TODO: enable new content notification for categories
 
 			if (!activeFeedIsCat() && id == getActiveFeedId()
@@ -386,10 +378,6 @@ function getFeedUnread(feed, is_cat) {
 	return -1;
 }
 
-function resort_feedlist() {
-	console.warn("resort_feedlist: function not implemented");
-}
-
 function hideOrShowFeeds(hide) {
 	var tree = dijit.byId("feedTree");