From 22f675e5c4195285b6b5033b451efa9cbb30384b Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Fri, 25 Jul 2014 13:54:10 +0400
Subject: add a link to headlines-spacer to open next unread feed

---
 js/viewfeed.js | 28 ++++++++++++++++++++++------
 1 file changed, 22 insertions(+), 6 deletions(-)

(limited to 'js/viewfeed.js')

diff --git a/js/viewfeed.js b/js/viewfeed.js
index dc6231c22..76248415a 100644
--- a/js/viewfeed.js
+++ b/js/viewfeed.js
@@ -108,6 +108,10 @@ function headlines_callback2(transport, offset, background, infscroll_req) {
 
 				initHeadlinesMenu();
 
+				if (_infscroll_disable)
+					hsp.innerHTML = "<a href='#' onclick='openNextUnreadFeed()'>" +
+						__("Click to open next unread feed.") + "</a>";
+
 				if (_search_query) {
 					$("feed_title").innerHTML += "<span id='cancel_search'>" +
 						" (<a href='#' onclick='cancelSearch()'>" + __("Cancel search") + "</a>)" +
@@ -176,7 +180,7 @@ function headlines_callback2(transport, offset, background, infscroll_req) {
 
 					var hsp = $("headlines-spacer");
 
-					if (hsp) hsp.innerHTML = "";
+					if (hsp) hsp.innerHTML = "Click to open next unread feed.";
 				}
 			}
 
@@ -1315,7 +1319,12 @@ function headlines_scroll_handler(e) {
 
 			}
 		} else {
-			if (hsp) hsp.innerHTML = "";
+			if (hsp)
+				if (_infscroll_disable)
+					hsp.innerHTML = "<a href='#' onclick='openNextUnreadFeed()'>" +
+						__("Click to open next unread feed.") + "</a>";
+				else
+					hsp.innerHTML = "";
 		}
 
 		if (isCdmMode()) {
@@ -1361,10 +1370,7 @@ function headlines_scroll_handler(e) {
 					console.log("we seem to be at an end");
 
 					if (getInitParam("on_catchup_show_next_feed") == "1") {
-						var is_cat = activeFeedIsCat();
-						var nuf = getNextUnreadFeed(getActiveFeedId(), is_cat);
-
-						if (nuf) viewfeed(nuf, '', is_cat);
+						openNextUnreadFeed();
 					}
 				}
 			}
@@ -1375,6 +1381,16 @@ function headlines_scroll_handler(e) {
 	}
 }
 
+function openNextUnreadFeed() {
+	try {
+		var is_cat = activeFeedIsCat();
+		var nuf = getNextUnreadFeed(getActiveFeedId(), is_cat);
+		if (nuf) viewfeed(nuf, '', is_cat);
+	} catch (e) {
+		exception_error("openNextUnreadFeed", e);
+	}
+}
+
 function catchupBatchedArticles() {
 	try {
 		if (catchup_id_batch.length > 0 && !_infscroll_request_sent) {
-- 
cgit v1.2.3