misc fixes, rework hotkeys code placement

[tt-rss.git] / viewfeed.js

diff --git a/viewfeed.js b/viewfeed.js
index 4a192a35e5e3da105857175698ec7053c56ab4a7..e5e862d59481fa3fc87dbf17de97b7ae74443297 100644 (file)
--- a/viewfeed.js
+++ b/viewfeed.js
@@ -795,6 +795,7 @@ function toggleUnread(id, cmode, effect) {
                var row = document.getElementById("RROW-" + id);
                if (row) {
                        var nc = row.className;
+                       var is_selected = row.className.match("Selected");
                        nc = nc.replace("Unread", "");
                        nc = nc.replace("Selected", "");
 
@@ -833,6 +834,9 @@ function toggleUnread(id, cmode, effect) {
                                row.className = nc + "Unread";
                        }
 
+                       // Disable unmarking as selected for the time being (16.05.08) -fox
+                       if (is_selected) row.className = row.className + "Selected";
+
                        if (cmode == undefined) cmode = 2;
 
                        var query = "backend.php?op=rpc&subop=catchupSelected&ids=" +
@@ -1679,6 +1683,24 @@ function cdmExpandArticle(a_id) {
 
 }
 
+function fixHeadlinesOrder(ids) {
+       try {
+               for (var i = 0; i < ids.length; i++) {
+                       var e = document.getElementById("RROW-" + ids[i]);
+
+                       if (e) {
+                               if (i % 2 == 0) {
+                                       e.className = e.className.replace("even", "odd");
+                               } else {
+                                       e.className = e.className.replace("odd", "even");
+                               }
+                       }
+               }
+       } catch (e) {
+               exception_error("fixHeadlinesOrder", e);
+       }
+}
+
 function subtoolbarSearch() {
 
        try {
@@ -1690,6 +1712,7 @@ function subtoolbarSearch() {
                q = q.value.toUpperCase();
 
                var ids = false;
+               var vis_ids = new Array();
 
                if (document.getElementById("headlinesList")) {
                        ids = getVisibleHeadlineIds();
@@ -1705,10 +1728,13 @@ function subtoolbarSearch() {
                                        Element.hide(document.getElementById("RROW-" + ids[i]));
                                } else {
                                        Element.show(document.getElementById("RROW-" + ids[i]));
+                                       vis_ids.push(ids[i]);
                                }
                        }
                }
 
+               fixHeadlinesOrder(vis_ids);
+
        } catch (e) {
                exception_error("subtoolbarSearch", e);
        }