fix id handling in getRelativeFeedId; allow on-catchup-show-next wrapping (closes...

diff --git a/feedlist.js b/feedlist.js
index cc36587a2eb288bbbdb3fdb99b74e8ea244950f8..5ee3acd9f2f4301c5c1c530f7769236cb8869686 100644 (file)
--- a/feedlist.js
+++ b/feedlist.js
@@ -62,6 +62,11 @@ function viewfeed(feed, subop, is_cat, subop_param) {
                        var next_unread_feed = getRelativeFeedId(feedlist,
                                        getActiveFeedId(), "next", true);
 
+                       if (!next_unread_feed) {
+                               next_unread_feed = getRelativeFeedId(feedlist,
+                                       -1, "next", true);
+                       }
+
                        var show_next_feed = getInitParam("on_catchup_show_next_feed") == "1";
 
                        if (next_unread_feed && show_next_feed && !activeFeedIsCat()) {

diff --git a/functions.js b/functions.js
index 491d435236d2c2d6245f6f86b665837f37cd62bf..ec24fc506b29db4d36036ef5915b8985845ca847 100644 (file)
--- a/functions.js
+++ b/functions.js
@@ -84,12 +84,14 @@ function delay(gap) {
 var notify_hide_timerid = false;
 var notify_last_doc = false;
 
-var notify_effect = false;
+var notify_effect = false; 
 
 function hide_notify() {
        if (notify_last_doc) {
                var n = notify_last_doc.getElementById("notify");               
-               if (browser_has_opacity()) {
+               n.style.display = "none";
+
+/*             if (browser_has_opacity()) {
                        if (notify_opacity >= 0) {
                                notify_opacity = notify_opacity - 0.1;
                                n.style.opacity = notify_opacity;
@@ -100,9 +102,9 @@ function hide_notify() {
                        }
                } else {
                        n.style.display = "none";
-               }
+               } */
        }
-}
+} 
 
 function notify_real(msg, doc, no_hide, is_err) {
 
@@ -976,7 +978,7 @@ function getRelativeFeedId(list, id, direction, unread_only) {
                                var child = list.childNodes[i];
                                if (child.id && child.id == "feedCatHolder") {
                                        if (child.lastChild) {
-                                               var cr = getRelativeFeedId(child.firstChild, id, direction);
+                                               var cr = getRelativeFeedId(child.firstChild, id, direction, unread_only);
                                                if (cr) return cr;                                      
                                        }
                                } else if (child.id && child.id.match("FEEDR-")) {
@@ -1010,7 +1012,7 @@ function getRelativeFeedId(list, id, direction, unread_only) {
                }
        } else {
        
-               var feed = list.ownerDocument.getElementById("FEEDR-" + getActiveFeedId());
+               var feed = list.ownerDocument.getElementById("FEEDR-" + id);
                
                if (getInitParam("hide_read_feeds") == 1) {
                        unread_only = true;
@@ -1046,7 +1048,8 @@ function getRelativeFeedId(list, id, direction, unread_only) {
                           }
 
                                if (e) {
-                                       if (!unread_only || (unread_only && e.className != "feed" && 
+                                       if (!unread_only || (unread_only && e.className != "feed" &&
+                                                       e.className != "label" && e.className != "virt" &&
                                                        e.className != "error"))        {
                                                return e.id.replace("FEEDR-", "");
                                        }

diff --git a/tt-rss.css b/tt-rss.css
index f3ca0c12b336c3c7b61b8b5d06cc520ac36344b4..ab4cdd6b0a25f4e8f60979826c757246891db107 100644 (file)
--- a/tt-rss.css
+++ b/tt-rss.css
@@ -140,7 +140,7 @@ div.postReply div.postIcon {
 ul.feedList {
        list-style-type : none;
        margin : 5px;
-       padding : 0px 0px 0px 10px;
+       padding : 0px 0px 0px 5px;
        font-size : small;
 }
 
@@ -161,7 +161,7 @@ ul.feedList li.feedCat a:hover {
 
 ul.feedCatList {
        list-style-type : none;
-       margin : 0px 0px 0px 20px;
+       margin : 0px 0px 0px 15px;
        padding : 0px;  
 }
 
@@ -343,9 +343,10 @@ td.notifyBox {
 }
 
 #dispSwitch {
-       padding : 5px 5px 5px 0px;
        font-size : x-small;
        text-align : right;
+       float : right;
+       margin : 5px 5px 0px 0px;
 }
 
 #dispSwitch a {
@@ -1247,7 +1248,7 @@ div.whiteBox {
        right : 5px;
        height : 40px;
        color : #4684ff;
-       font-size : x-small;
+       font-size : small;
 }
 
 #feeds-holder {