summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2014-07-25 13:54:10 +0400
committerAndrew Dolgov <[email protected]>2014-07-25 13:54:10 +0400
commit22f675e5c4195285b6b5033b451efa9cbb30384b (patch)
treee0a1ac2949daf5327b4bb0f446b0dc1ed04e9110
parent0f85f483e5f7a2eafe976433a119cf3957bc97f8 (diff)
add a link to headlines-spacer to open next unread feed
-rw-r--r--css/tt-rss.css7
-rw-r--r--js/functions.js1
-rw-r--r--js/viewfeed.js28
3 files changed, 29 insertions, 7 deletions
diff --git a/css/tt-rss.css b/css/tt-rss.css
index 4852c8ca1..76e35e110 100644
--- a/css/tt-rss.css
+++ b/css/tt-rss.css
@@ -910,10 +910,15 @@ img.feedIcon, img.tinyFeedIcon {
height : 100%;
margin-left : 1px;
text-align : center;
- padding : 1em;
+ padding : 10px;
color : #555;
+ font-size : 11px;
+ font-style : italic;
}
+#headlines-spacer a {
+ color : #555;
+}
ul#filterDlg_Matches, ul#filterDlg_Actions {
max-height : 100px;
diff --git a/js/functions.js b/js/functions.js
index aa840382c..9915e6808 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -204,6 +204,7 @@ function notify_real(msg, no_hide, n_type) {
return;
} else {
Element.show(n);
+ new Effect.Highlight(n);
}
/* types:
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) {