]> git.wh0rd.org - tt-rss.git/blobdiff - viewfeed.js
use multiple classes to mark statuses, JS code cleanup
[tt-rss.git] / viewfeed.js
index a5654eb45bf4a3f91207e437a23786f35bb44da5..597ae53021bc6fa863b5df794827202d58e6420d 100644 (file)
@@ -58,6 +58,10 @@ function headlines_callback2(transport, feed_cur_page) {
                        }
                }
 
+               var update_btn = document.forms["main_toolbar_form"].update;
+
+               update_btn.disabled = !(feed_id >= 0 && !is_cat);
+
                var ll = $('FLL-' + feed_id);
 
                if (ll && ll.parentNode) 
@@ -65,13 +69,13 @@ function headlines_callback2(transport, feed_cur_page) {
 
                if (!is_cat) {
                        var feedr = $("FEEDR-" + feed_id);
-                       if (feedr && !feedr.className.match("Selected")) {      
-                               feedr.className = feedr.className + "Selected";
+                       if (feedr) {    
+                               feedr.addClassName("Selected");
                        } 
                } else {
                        var feedr = $("FCAT-" + feed_id);
-                       if (feedr && !feedr.className.match("Selected")) {      
-                               feedr.className = feedr.className + "Selected";
+                       if (feedr) {    
+                               feedr.addClassName("Selected");
                        } 
                }
 
@@ -108,7 +112,7 @@ function headlines_callback2(transport, feed_cur_page) {
                        
                        vgroup_last_feed = headlines_info.vgroup_last_feed;
 
-                       if (headlines_count == 0) {
+                       if (parseInt(headlines_count) < getInitParam("default_article_limit")) {
                                _infscroll_disable = 1;
                        } else {
                                _infscroll_disable = 0;
@@ -147,11 +151,7 @@ function headlines_callback2(transport, feed_cur_page) {
                                        if (headlines_count > 0) {
                                                console.log("adding some more headlines...");
        
-                                               var c = $("headlinesList");
-               
-                                               if (!c) {
-                                                       c = $("headlinesInnerContainer");
-                                               }
+                                               c = $("headlinesInnerContainer");
 
                                                var ids = getSelectedArticleIds2();
        
@@ -199,7 +199,7 @@ function headlines_callback2(transport, feed_cur_page) {
        
 
                if (_cdm_wd_timeout) window.clearTimeout(_cdm_wd_timeout);
-       
+
                if (isCdmMode() && 
                                getActiveFeedId() != -3 &&
                                getInitParam("cdm_auto_catchup") == 1) {
@@ -248,15 +248,15 @@ function showArticleInHeadlines(id) {
 
        try {
 
-               cleanSelected("headlinesList");
-       
+               selectArticles("none");
+
                var crow = $("RROW-" + id);
 
                if (!crow) return;
 
-               var article_is_unread = crow.className.match("Unread");
+               var article_is_unread = crow.hasClassName("Unread");
                        
-               crow.className = crow.className.replace("Unread", "");
+               crow.removeClassName("Unread");
 
                selectArticles('none');
 
@@ -417,18 +417,10 @@ function view(id) {
 
                console.log("additional ids: " + cids_to_request.toString());                   
        
-               /* additional info for piggyback counters */
-
-               if (tagsAreDisplayed()) {
-                       query = query + "&omode=lt";
-               } else {
-                       query = query + "&omode=flc";
-               }
-
                query = query + "&cids=" + cids_to_request.toString();
 
                var crow = $("RROW-" + id);
-               var article_is_unread = crow.className.match("Unread");
+               var article_is_unread = crow.hasClassName("Unread");
 
                active_post_id = id;
                showArticleInHeadlines(id);
@@ -513,30 +505,17 @@ function tPub_afh_off(effect) {
        }
 }
 
-function toggleMark(id, client_only, no_effects) {
-
+function toggleMark(id, client_only) {
        try {
-
                var query = "?op=rpc&id=" + id + "&subop=mark";
        
-               query = query + "&afid=" + getActiveFeedId();
-       
-               if (tagsAreDisplayed()) {
-                       query = query + "&omode=tl";
-               } else {
-                       query = query + "&omode=flc";
-               }
-       
-               var mark_img = $("FMPIC-" + id);
-
-               if (!mark_img) return;
+               var img = $("FMPIC-" + id);
 
-               var vfeedu = $("FEEDU--1");
-               var crow = $("RROW-" + id);
+               if (!img) return;
        
-               if (mark_img.src.match("mark_unset")) {
-                       mark_img.src = mark_img.src.replace("mark_unset", "mark_set");
-                       mark_img.alt = __("Unstar article");
+               if (img.src.match("mark_unset")) {
+                       img.src = img.src.replace("mark_unset", "mark_set");
+                       img.alt = __("Unstar article");
                        query = query + "&mark=1";
 
                        if (db) {
@@ -544,33 +523,23 @@ function toggleMark(id, client_only, no_effects) {
                        }
 
                } else {
-                       mark_img.alt = __("Please wait...");
+                       img.src = img.src.replace("mark_set", "mark_unset");
+                       img.alt = __("Star article");
                        query = query + "&mark=0";
-       
-                       if (!isCdmMode() && !no_effects) {
-                               Effect.Puff(mark_img, {duration : 0.25, afterFinish: tMark_afh_off});
-                       } else { 
-                               mark_img.src = mark_img.src.replace("mark_set", "mark_unset");
-                               mark_img.alt = __("Star article");
-                       }
 
                        if (db) {
                                db.execute("UPDATE articles SET marked = 0 WHERE id = ?", [id]);
                        }
-
                }
 
-               if (!no_effects) update_local_feedlist_counters();
+               update_local_feedlist_counters();
 
                if (!client_only) {
-                       //console.log(query);
-
                        new Ajax.Request("backend.php", {
                                parameters: query,
                                onComplete: function(transport) { 
                                        handle_rpc_reply(transport); 
                                } });
-
                }
 
        } catch (e) {
@@ -579,47 +548,29 @@ function toggleMark(id, client_only, no_effects) {
 }
 
 function togglePub(id, client_only, no_effects, note) {
-
        try {
-
                var query = "?op=rpc&id=" + id + "&subop=publ";
        
-               query = query + "&afid=" + getActiveFeedId();
-
                if (note != undefined) {
                        query = query + "&note=" + param_escape(note);
                } else {
                        query = query + "&note=undefined";
                }
-       
-               if (tagsAreDisplayed()) {
-                       query = query + "&omode=tl";
-               } else {
-                       query = query + "&omode=flc";
-               }
-       
-               var mark_img = $("FPPIC-" + id);
 
-               if (!mark_img) return;
+               var img = $("FPPIC-" + id);
 
-               var vfeedu = $("FEEDU--2");
-               var crow = $("RROW-" + id);
+               if (!img) return;
        
-               if (mark_img.src.match("pub_unset") || note != undefined) {
-                       mark_img.src = mark_img.src.replace("pub_unset", "pub_set");
-                       mark_img.alt = __("Unpublish article");
+               if (img.src.match("pub_unset") || note != undefined) {
+                       img.src = img.src.replace("pub_unset", "pub_set");
+                       img.alt = __("Unpublish article");
                        query = query + "&pub=1";
 
                } else {
-                       mark_img.alt = __("Please wait...");
+                       img.src = img.src.replace("pub_set", "pub_unset");
+                       img.alt = __("Publish article");
+
                        query = query + "&pub=0";
-       
-                       if (!isCdmMode() && !no_effects) {
-                               Effect.Puff(mark_img, {duration : 0.25, afterFinish: tPub_afh_off});
-                       } else { 
-                               mark_img.src = mark_img.src.replace("pub_set", "pub_unset");
-                               mark_img.alt = __("Publish article");
-                       }
                }
 
                if (!client_only) {
@@ -657,38 +608,6 @@ function togglePub(id, client_only, no_effects, note) {
        }
 }
 
-function correctHeadlinesOffset(id) {
-       
-       try {
-
-               var hlist = $("headlinesList");
-               var container = $("headlinesInnerContainer");
-               var row = $("RROW-" + id);
-       
-               var viewport = container.offsetHeight;
-       
-               var rel_offset_top = row.offsetTop - container.scrollTop;
-               var rel_offset_bottom = row.offsetTop + row.offsetHeight - container.scrollTop;
-       
-               console.log("Rtop: " + rel_offset_top + " Rbtm: " + rel_offset_bottom);
-               console.log("Vport: " + viewport);
-
-               if (rel_offset_top <= 0 || rel_offset_top > viewport) {
-                       container.scrollTop = row.offsetTop;
-               } else if (rel_offset_bottom > viewport) {
-
-                       /* doesn't properly work with Opera in some cases because
-                               Opera fucks up element scrolling */
-
-                       container.scrollTop = row.offsetTop + row.offsetHeight - viewport;              
-               } 
-
-       } catch (e) {
-               exception_error("correctHeadlinesOffset", e);
-       }
-
-}
-
 function moveToPost(mode) {
 
        try {
@@ -749,28 +668,16 @@ function toggleSelected(id) {
        try {
        
                var cb = $("RCHK-" + id);
-
                var row = $("RROW-" + id);
-               if (row) {
-                       var nc = row.className;
-                       
-                       if (!nc.match("Selected")) {
-                               nc = nc + "Selected";
-                               if (cb) {
-                                       cb.checked = true;
-                               }
 
-                               // In CDM basically last selected article == active article
-                               if (isCdmMode()) active_post_id = id;
+               if (row) {
+                       if (row.hasClassName('Selected')) {
+                               row.removeClassName('Selected');
+                               if (cb) cb.checked = false;
                        } else {
-                               nc = nc.replace("Selected", "");
-                               if (cb) {
-                                       cb.checked = false;
-                               }
-
+                               row.addClassName('Selected');
+                               if (cb) cb.checked = true;
                        }
-
-                       row.className = nc;
                }
        } catch (e) {
                exception_error("toggleSelected", e);
@@ -793,24 +700,9 @@ function toggleUnread(id, cmode, effect) {
        
                var row = $("RROW-" + id);
                if (row) {
-                       var nc = row.className;
-                       var is_selected = row.className.match("Selected");
-                       nc = nc.replace("Unread", "");
-                       nc = nc.replace("Selected", "");
-
-                       // since we are removing selection from the object, uncheck
-                       // corresponding checkbox
-
-                       var cb = $("RCHK-" + id);
-                       if (cb) {
-                               cb.checked = false;
-                       }
-
-                       // NOTE: I'm not sure that resetting selection here is a feature -fox
-
                        if (cmode == undefined || cmode == 2) {
-                               if (row.className.match("Unread")) {
-                                       row.className = nc;
+                               if (row.hasClassName("Unread")) {
+                                       row.removeClassName("Unread");
 
                                        if (effect) {
                                                new Effect.Highlight(row, {duration: 1, startcolor: "#fff7d5",
@@ -819,7 +711,7 @@ function toggleUnread(id, cmode, effect) {
                                        } 
 
                                } else {
-                                       row.className = nc + "Unread";
+                                       row.addClassName("Unread");
                                }
 
                                if (db) {
@@ -828,7 +720,8 @@ function toggleUnread(id, cmode, effect) {
                                }
 
                        } else if (cmode == 0) {
-                               row.className = nc;
+
+                               row.removeClassName("Unread");
 
                                if (effect) {
                                        new Effect.Highlight(row, {duration: 1, startcolor: "#fff7d5",
@@ -842,7 +735,7 @@ function toggleUnread(id, cmode, effect) {
                                }
 
                        } else if (cmode == 1) {
-                               row.className = nc + "Unread";
+                               row.addClassName("Unread");
 
                                if (db) {
                                        db.execute("UPDATE articles SET unread = 1 "+
@@ -853,9 +746,6 @@ function toggleUnread(id, cmode, effect) {
 
                        update_local_feedlist_counters();
 
-                       // 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 = "?op=rpc&subop=catchupSelected" +
@@ -964,15 +854,11 @@ function selectionToggleUnread(set_state, callback_func, no_error) {
                for (i = 0; i < rows.length; i++) {
                        var row = $("RROW-" + rows[i]);
                        if (row) {
-                               var nc = row.className;
-                               nc = nc.replace("Unread", "");
-                               nc = nc.replace("Selected", "");
-
                                if (set_state == undefined) {
-                                       if (row.className.match("Unread")) {
-                                               row.className = nc + "Selected";
+                                       if (row.hasClassName("Unread")) {
+                                               row.removeClassName("Unread");
                                        } else {
-                                               row.className = nc + "UnreadSelected";
+                                               row.addClassName("Unread");
                                        }
                                        if (db) {
                                                db.execute("UPDATE articles SET unread = NOT unread WHERE id = ?", 
@@ -981,7 +867,8 @@ function selectionToggleUnread(set_state, callback_func, no_error) {
                                }
 
                                if (set_state == false) {
-                                       row.className = nc + "Selected";
+                                       row.removeClassName("Unread");
+
                                        if (db) {
                                                db.execute("UPDATE articles SET unread = 0 WHERE id = ?", 
                                                        [rows[i]]);
@@ -989,7 +876,8 @@ function selectionToggleUnread(set_state, callback_func, no_error) {
                                }
 
                                if (set_state == true) {
-                                       row.className = nc + "UnreadSelected";
+                                       row.addClassName("Unread");
+
                                        if (db) {
                                                db.execute("UPDATE articles SET unread = 1 WHERE id = ?", 
                                                        [rows[i]]);
@@ -1051,10 +939,6 @@ function selectionToggleMarked() {
                        var query = "?op=rpc&subop=markSelected&ids=" +
                                param_escape(rows.toString()) + "&cmode=2";
 
-                       query = query + "&afid=" + getActiveFeedId();
-
-                       query = query + "&omode=lc";
-
                        new Ajax.Request("backend.php", {
                                parameters: query,
                                onComplete: function(transport) { 
@@ -1087,10 +971,6 @@ function selectionTogglePublished() {
                        var query = "?op=rpc&subop=publishSelected&ids=" +
                                param_escape(rows.toString()) + "&cmode=2";
 
-                       query = query + "&afid=" + getActiveFeedId();
-
-                       query = query + "&omode=lc";
-
                        new Ajax.Request("backend.php", {
                                parameters: query,
                                onComplete: function(transport) { 
@@ -1105,93 +985,65 @@ function selectionTogglePublished() {
 }
 
 function getSelectedArticleIds2() {
-       var sel_articles = new Array();
-
-       var children;
-       
-       if (isCdmMode())
-               var children = $("headlinesInnerContainer").childNodes;
-       else
-               var children = $("headlinesList").rows;
 
-       for (i = 0; i < children.length; i++) {
-               var child = children[i];
+       var rv = [];
 
-               if (child.id && child.id.match("RROW-") && child.className.match("Selected")) {
-                       var c_id = child.id.replace("RROW-", "");
-                       sel_articles.push(c_id);
-               }
-       }
+       $$("#headlinesInnerContainer > div[id*=RROW][class*=Selected]").each(
+               function(child) {
+                       rv.push(child.id.replace("RROW-", ""));
+               });
 
-       return sel_articles;
+       return rv;
 }
 
 function getLoadedArticleIds() {
-       var sel_articles = new Array();
-
-       if (isCdmMode())
-               var children = $("headlinesInnerContainer").childNodes;
-       else
-               var children = $("headlinesList").rows;
+       var rv = [];
 
-       if (!children) return sel_articles;
+       var children = $$("#headlinesInnerContainer > div[id*=RROW-]");
 
-       for (i = 0; i < children.length; i++) {
-               var child = children[i];
+       children.each(function(child) {
+                       rv.push(child.id.replace("RROW-", ""));
+               });
 
-               if (child.id && child.id.match("RROW-")) {
-                       var c_id = child.id.replace("RROW-", "");
-                       sel_articles.push(c_id);
-               }
-       }
+       return rv;
 
-       return sel_articles;
 }
 
 // mode = all,none,unread,invert
 function selectArticles(mode) {
        try {
 
-               var children;
-       
-               if (isCdmMode())
-                       var children = $("headlinesInnerContainer").childNodes;
-               else
-                       var children = $("headlinesList").rows;
+               var children = $$("#headlinesInnerContainer > div[id*=RROW]");
 
-               for (i = 0; i < children.length; i++) {
-                       var child = children[i];
-       
-                       if (child.id && child.id.match("RROW-")) {
-                               var aid = child.id.replace("RROW-", "");
-       
-                               var cb = $("RCHK-" + aid);
-       
-                               if (mode == "all") {
-                                       if (!child.className.match("Selected")) {
-                                               child.className = child.className + "Selected";
-                                               cb.checked = true;
-                                       }
-                               } else if (mode == "unread") {
-                                       if (child.className.match("Unread") && !child.className.match("Selected")) {
-                                               child.className = child.className + "Selected";
-                                               cb.checked = true;
-                                       }
-                               } else if (mode == "invert") {
-                                       if (child.className.match("Selected")) {
-                                               child.className = child.className.replace("Selected", "");
-                                               cb.checked = false;
-                                       } else {
-                                               child.className = child.className + "Selected";
-                                               cb.checked = true;
-                                       }
+               children.each(function(child) {
+                       var id = child.id.replace("RROW-", "");
+                       var cb = $("RCHK-" + id);
 
+                       if (mode == "all") {
+                               child.addClassName("Selected");
+                               cb.checked = true;
+                       } else if (mode == "unread") {
+                               if (child.hasClassName("Unread")) {
+                                       child.addClassName("Selected");
+                                       cb.checked = true;
                                } else {
-                                       child.className = child.className.replace("Selected", "");
+                                       child.removeClassName("Selected");
                                        cb.checked = false;
                                }
-                       }               
-               }
+                       } else if (mode == "invert") {
+                               if (child.hasClassName("Selected")) {
+                                       child.removeClassName("Selected");
+                                       cb.checked = false;
+                               } else {
+                                       child.addClassName("Selected");
+                                       cb.checked = true;
+                               }
+
+                       } else {
+                               child.removeClassName("Selected");
+                               cb.checked = false;
+                       }
+               });
 
        } catch (e) {
                exception_error("selectArticles", e);
@@ -1329,11 +1181,7 @@ function catchupSelection() {
                        return;
                }
        
-               if ($("headlinesList")) {
-                       selectionToggleUnread(false, 'viewCurrentFeed()', true);
-               } else {
-                       selectionToggleUnread(false, 'viewCurrentFeed()', true)
-               }
+               selectionToggleUnread(false, 'viewCurrentFeed()', true)
 
        } catch (e) {
                exception_error("catchupSelection", e);
@@ -1451,7 +1299,7 @@ function cdmWatchdog() {
                var e = ctr.firstChild;
 
                while (e) {
-                       if (e.className && e.className == "cdmArticleUnread" && e.id &&
+                       if (e.className && e.hasClassName("Unread") && e.id &&
                                        e.id.match("RROW-")) {
 
                                // article fits in viewport OR article is longer than viewport and
@@ -1495,7 +1343,7 @@ function cdmWatchdog() {
                        for (var i = 0; i < ids.length; i++) {
                                var e = $("RROW-" + ids[i]);
                                if (e) {
-                                       e.className = e.className.replace("Unread", "");
+                                       e.removeClassName("Unread");
                                }
                        }
 
@@ -1919,7 +1767,7 @@ function catchupRelativeToArticle(below) {
                                if (visible_ids[i] != getActiveArticleId()) {
                                        var e = $("RROW-" + visible_ids[i]);
 
-                                       if (e && e.className.match("Unread")) {
+                                       if (e && e.hasClassName("Unread")) {
                                                ids_to_mark.push(visible_ids[i]);
                                        }
                                } else {
@@ -1931,7 +1779,7 @@ function catchupRelativeToArticle(below) {
                                if (visible_ids[i] != getActiveArticleId()) {
                                        var e = $("RROW-" + visible_ids[i]);
 
-                                       if (e && e.className.match("Unread")) {
+                                       if (e && e.hasClassName("Unread")) {
                                                ids_to_mark.push(visible_ids[i]);
                                        }
                                } else {
@@ -1949,7 +1797,7 @@ function catchupRelativeToArticle(below) {
 
                                for (var i = 0; i < ids_to_mark.length; i++) {
                                        var e = $("RROW-" + ids_to_mark[i]);
-                                       e.className = e.className.replace("Unread", "");
+                                       e.removeClassName("Unread");
                                }
 
                                var query = "?op=rpc&subop=catchupSelected" +
@@ -2003,6 +1851,37 @@ function cdmExpandArticle(id) {
                if (!Element.visible(elem)) {
                        Element.show(elem);
                        Element.hide("CEXC-" + id);
+
+                       if ($("CWRAP-" + id).innerHTML == "") {
+
+                               $("FUPDPIC-" + id).src = "images/indicator_tiny.gif";
+
+                               $("CWRAP-" + id).innerHTML = "<div class=\"insensitive\">" + 
+                                       __("Loading, please wait...") + "</div>";
+       
+                               var query = "?op=rpc&subop=cdmGetArticle&id=" + param_escape(id);
+       
+                               //console.log(query);
+       
+                               new Ajax.Request("backend.php", {
+                                       parameters: query,
+                                       onComplete: function(transport) { 
+                                               $("FUPDPIC-" + id).src = 'images/blank_icon.gif';
+       
+                                               if (transport.responseXML) {
+                                                       var article = transport.responseXML.getElementsByTagName("article")[0];
+                                                       var recv_id = article.getAttribute("id");
+       
+                                                       if (recv_id == id)
+                                                               $("CWRAP-" + id).innerHTML = article.firstChild.nodeValue;
+       
+                                               } else {
+                                                       $("CWRAP-" + id).innerHTML = __("Unable to load article.");
+       
+                                               }
+                               }});
+       
+                       }
                }
 
                var new_offset = $("RROW-" + id).offsetTop;
@@ -2029,9 +1908,11 @@ function fixHeadlinesOrder(ids) {
 
                        if (e) {
                                if (i % 2 == 0) {
-                                       e.className = e.className.replace("even", "odd");
+                                       e.removeClassName("even");
+                                       e.addClassName("odd");
                                } else {
-                                       e.className = e.className.replace("odd", "even");
+                                       e.removeClassName("odd");
+                                       e.addClassName("even");
                                }
                        }
                }
@@ -2040,45 +1921,6 @@ function fixHeadlinesOrder(ids) {
        }
 }
 
-function invertHeadlineSelection() {
-       try {
-               var rows = new Array();
-               var r = false;
-               
-               if (!isCdmMode()) {             
-                       r = document.getElementsByTagName("TR");
-               } else {
-                       r = document.getElementsByTagName("DIV");
-               }
-
-               for (var i = 0; i < r.length; i++) {
-                       if (r[i].id && r[i].id.match("RROW-")) {
-                               rows.push(r[i]);
-                       }
-               }
-               
-               for (var i = 0; i < rows.length; i++) {
-                       var nc = rows[i].className;
-                       var id = rows[i].id.replace("RROW-", "");
-                       var cb = $("RCHK-" + id);
-
-                       if (!rows[i].className.match("Selected")) {
-                               nc = nc + "Selected";
-                               cb.checked = true;
-                       } else {
-                               nc = nc.replace("Selected", "");
-                               cb.checked = false;
-                       }
-
-                       rows[i].className = nc;
-
-               }
-
-       } catch (e) {
-               exception_error("invertHeadlineSelection", e);
-       }
-}
-
 function getArticleUnderPointer() {
        return post_under_pointer;
 }
@@ -2255,6 +2097,8 @@ function dismissArticle(id) {
 
                new Effect.Fade(elem, {duration : 0.5});
 
+               active_post_id = false;
+
        } catch (e) {
                exception_error("dismissArticle", e);
        }
@@ -2270,7 +2114,8 @@ function dismissSelectedArticles() {
                for (var i = 0; i < ids.length; i++) {
                        var elem = $("RROW-" + ids[i]);
 
-                       if (elem.className && elem.className.match("Selected")) {
+                       if (elem.className && elem.hasClassName("Selected") && 
+                                       ids[i] != active_post_id) {
                                new Effect.Fade(elem, {duration : 0.5});
                                sel.push(ids[i]);
                        } else {
@@ -2297,8 +2142,8 @@ function dismissReadArticles() {
                for (var i = 0; i < ids.length; i++) {
                        var elem = $("RROW-" + ids[i]);
 
-                       if (elem.className && !elem.className.match("Unread") && 
-                                       !elem.className.match("Selected")) {
+                       if (elem.className && !elem.hasClassName("Unread") && 
+                                       !elem.hasClassName("Selected")) {
                        
                                new Effect.Fade(elem, {duration : 0.5});
                        } else {
@@ -2317,13 +2162,12 @@ function getVisibleArticleIds() {
        var ids = [];
 
        try {
-               var tmp = getLoadedArticleIds();
-
-               for (var i = 0; i < tmp.length; i++) {
-                       var elem = $("RROW-" + tmp[i]);
+               
+               getLoadedArticleIds().each(function(id) {
+                       var elem = $("RROW-" + id);
                        if (elem && Element.visible(elem))
-                               ids.push(tmp[i]);
-               }
+                               ids.push(id);
+                       });
 
        } catch (e) {
                exception_error("getVisibleArticleIds", e);
@@ -2345,7 +2189,7 @@ function cdmClicked(event, id) {
                        var elem = $("RROW-" + id);
 
                        if (elem)
-                               elem.className = elem.className.replace("Unread", "");
+                               elem.removeClassName("Unread");
 
                        var upd_img_pic = $("FUPDPIC-" + id);
 
@@ -2355,6 +2199,8 @@ function cdmClicked(event, id) {
                                upd_img_pic.src = "images/blank_icon.gif";
                        }
 
+                       active_post_id = id;
+
                        var query = "?op=rpc&subop=catchupSelected" +
                                "&cmode=0&ids=" + param_escape(id);
 
@@ -2378,7 +2224,6 @@ function cdmClicked(event, id) {
 
 function hlClicked(event, id) {
        try {
-               var shift_key = event.shiftKey;
 
                if (!event.ctrlKey) {
                        view(id);
@@ -2406,41 +2251,6 @@ function getLastVisibleHeadlineId() {
        return rows[rows.length-1];
 }
 
-// this only searches loaded headlines list, not in CDM
-function getRelativePostIds(id, limit) {
-
-       if (!limit) limit = 3;
-
-       //console.log("getRelativePostIds: " + id + " limit=" + limit);
-
-       var ids = new Array();
-       var container = $("headlinesList");
-
-       if (container) {
-               var rows = container.rows;
-
-               for (var i = 0; i < rows.length; i++) {
-                       var r_id = rows[i].id.replace("RROW-", "");
-
-                       if (r_id == id) {
-                               for (var k = 1; k <= limit; k++) {
-                                       var nid = false;
-
-                                       if (i > k-1) var nid = rows[i-k].id.replace("RROW-", "");
-                                       if (nid) ids.push(nid);
-
-                                       if (i < rows.length-k) nid = rows[i+k].id.replace("RROW-", "");
-                                       if (nid) ids.push(nid);
-                               }
-
-                               return ids;
-                       }
-               }
-       }
-
-       return false;
-}
-
 function openArticleInNewWindow(id) {
        try {
                console.log("openArticleInNewWindow: " + id);
@@ -2475,9 +2285,7 @@ function openArticleInNewWindow(id) {
                
                                                if (id) {
                                                        id = id.firstChild.nodeValue;
-                                                       if (!$("headlinesList")) {
-                                                               window.setTimeout("toggleUnread(" + id + ", 0)", 100);
-                                                       }
+                                                       window.setTimeout("toggleUnread(" + id + ", 0)", 100);
                                                }
                                        } else {
                                                notify_error("Can't open article: received invalid article link");
@@ -2490,34 +2298,78 @@ function openArticleInNewWindow(id) {
 }
 
 function isCdmMode() {
-       return !$("headlinesList");
+       return getInitParam("combined_display_mode");
 }
 
 function markHeadline(id) {
        var row = $("RROW-" + id);
        if (row) {
-               var is_active = false;
-       
-               if (row.className.match("Active")) {
-                       is_active = true;
-               }
-               row.className = row.className.replace("Selected", "");
-               row.className = row.className.replace("Active", "");
-               row.className = row.className.replace("Insensitive", "");
-               
-               if (is_active) {
-                       row.className = row.className = "Active";
-               }
-               
                var check = $("RCHK-" + id);
 
                if (check) {
                        check.checked = true;
                }
 
-               row.className = row.className + "Selected"; 
-               
+               row.addClassName("Selected");
+       }
+}
+
+function getRelativePostIds(id, limit) {
+
+       var tmp = [];
+
+       try {
+
+               if (!limit) limit = 3;
+       
+               var ids = getVisibleArticleIds();
+       
+               for (var i = 0; i < ids.length; i++) {
+                       if (ids[i] == id) {
+                               for (var k = 1; k <= limit; k++) {
+                                       if (i > k-1) tmp.push(ids[i-k]);
+                                       if (i < ids.length-k) tmp.push(ids[i+k]);
+                               }
+                               break;
+                       }
+               }
+
+       } catch (e) {
+               exception_error("getRelativePostIds", e);
        }
+
+       return tmp;
+}
+
+function correctHeadlinesOffset(id) {
+       
+       try {
+
+               var container = $("headlinesInnerContainer");
+               var row = $("RROW-" + id);
+       
+               var viewport = container.offsetHeight;
+       
+               var rel_offset_top = row.offsetTop - container.scrollTop;
+               var rel_offset_bottom = row.offsetTop + row.offsetHeight - container.scrollTop;
+       
+               //console.log("Rtop: " + rel_offset_top + " Rbtm: " + rel_offset_bottom);
+               //console.log("Vport: " + viewport);
+
+               if (rel_offset_top <= 0 || rel_offset_top > viewport) {
+                       container.scrollTop = row.offsetTop;
+               } else if (rel_offset_bottom > viewport) {
+
+                       /* doesn't properly work with Opera in some cases because
+                               Opera fucks up element scrolling */
+
+                       container.scrollTop = row.offsetTop + row.offsetHeight - viewport;              
+               } 
+
+       } catch (e) {
+               exception_error("correctHeadlinesOffset", e);
+       }
+
 }