]> git.wh0rd.org - tt-rss.git/blobdiff - viewfeed.js
use multiple classes to mark statuses, JS code cleanup
[tt-rss.git] / viewfeed.js
index e9cf4c7c0b088b98cc607b8fd53b84666436fa25..597ae53021bc6fa863b5df794827202d58e6420d 100644 (file)
@@ -33,23 +33,6 @@ function catchup_callback2(transport, callback) {
        }
 }
 
-function clean_feed_selections() {
-       try {
-               var feeds = $("feedList").getElementsByTagName("LI");
-
-               for (var i = 0; i < feeds.length; i++) {
-                       if (feeds[i].id && feeds[i].id.match("FEEDR-")) {
-                               feeds[i].className = feeds[i].className.replace("Selected", "");
-                       }                       
-                       if (feeds[i].id && feeds[i].id.match("FCAT-")) {
-                               feeds[i].className = feeds[i].className.replace("Selected", "");
-                       }
-               }
-       } catch (e) {
-               exception_error("clean_feed_selections", e);
-       }
-}
-
 function headlines_callback2(transport, feed_cur_page) {
        try {
 
@@ -75,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) 
@@ -82,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");
                        } 
                }
 
@@ -125,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;
@@ -164,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();
        
@@ -216,8 +199,8 @@ function headlines_callback2(transport, feed_cur_page) {
        
 
                if (_cdm_wd_timeout) window.clearTimeout(_cdm_wd_timeout);
-       
-               if (!$("headlinesList") && 
+
+               if (isCdmMode() && 
                                getActiveFeedId() != -3 &&
                                getInitParam("cdm_auto_catchup") == 1) {
                        console.log("starting CDM watchdog");
@@ -265,18 +248,18 @@ 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');
 
-               selectTableRowsByIdPrefix('headlinesList', 'RROW-', 'RCHK-', false);
-       
                var upd_img_pic = $("FUPDPIC-" + id);
 
                var cache_prefix = "";
@@ -355,7 +338,7 @@ function article_callback2(transport, id) {
                                return;
                        }
 
-                       active_post_id = id; 
+//                     active_post_id = id; 
 
                        //console.log("looking for articles to cache...");
 
@@ -375,7 +358,7 @@ function article_callback2(transport, id) {
                        }
 
 
-                       showArticleInHeadlines(id);     
+//                     showArticleInHeadlines(id);     
 
                        if (db) {
                                db.execute("UPDATE articles SET unread = 0 WHERE id = ?", [id]);
@@ -434,19 +417,12 @@ 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);
 
                if (!cached_article) {
@@ -529,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) {
@@ -560,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 ($("headlinesList") && !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) {
@@ -595,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 ($("headlinesList") && !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) {
@@ -673,50 +608,12 @@ 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 {
 
-               var rows;
+               var rows = getVisibleArticleIds();
 
-               if (isCdmMode()) {
-                       rows = cdmGetVisibleArticles();
-               } else {
-                       rows = getVisibleHeadlineIds();
-               }
-               
                var prev_id = false;
                var next_id = false;
                
@@ -771,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);
@@ -815,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",
@@ -841,7 +711,7 @@ function toggleUnread(id, cmode, effect) {
                                        } 
 
                                } else {
-                                       row.className = nc + "Unread";
+                                       row.addClassName("Unread");
                                }
 
                                if (db) {
@@ -850,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",
@@ -864,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 "+
@@ -875,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" +
@@ -986,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 = ?", 
@@ -1003,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]]);
@@ -1011,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]]);
@@ -1073,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) { 
@@ -1109,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) { 
@@ -1126,84 +984,69 @@ function selectionTogglePublished() {
        }
 }
 
-function cdmGetSelectedArticles() {
-       var sel_articles = new Array();
-       var container = $("headlinesInnerContainer");
+function getSelectedArticleIds2() {
 
-       for (i = 0; i < container.childNodes.length; i++) {
-               var child = container.childNodes[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 cdmGetVisibleArticles() {
-       var sel_articles = new Array();
-       var container = $("headlinesInnerContainer");
-
-       if (!container) return sel_articles;
+function getLoadedArticleIds() {
+       var rv = [];
 
-       for (i = 0; i < container.childNodes.length; i++) {
-               var child = container.childNodes[i];
+       var children = $$("#headlinesInnerContainer > div[id*=RROW-]");
 
-               if (child.id && child.id.match("RROW-")) {
-                       var c_id = child.id.replace("RROW-", "");
-                       sel_articles.push(c_id);
-               }
-       }
-
-       return sel_articles;
-}
-
-function cdmGetUnreadArticles() {
-       var sel_articles = new Array();
-       var container = $("headlinesInnerContainer");
-
-       for (i = 0; i < container.childNodes.length; i++) {
-               var child = container.childNodes[i];
+       children.each(function(child) {
+                       rv.push(child.id.replace("RROW-", ""));
+               });
 
-               if (child.id && child.id.match("RROW-") && child.className.match("Unread")) {
-                       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 {
 
-// mode = all,none,unread
-function cdmSelectArticles(mode) {
-       var container = $("headlinesInnerContainer");
-
-       for (i = 0; i < container.childNodes.length; i++) {
-               var child = container.childNodes[i];
-
-               if (child.id && child.id.match("RROW-")) {
-                       var aid = child.id.replace("RROW-", "");
+               var children = $$("#headlinesInnerContainer > div[id*=RROW]");
 
-                       var cb = $("RCHK-" + aid);
+               children.each(function(child) {
+                       var id = child.id.replace("RROW-", "");
+                       var cb = $("RCHK-" + id);
 
                        if (mode == "all") {
-                               if (!child.className.match("Selected")) {
-                                       child.className = child.className + "Selected";
+                               child.addClassName("Selected");
+                               cb.checked = true;
+                       } else if (mode == "unread") {
+                               if (child.hasClassName("Unread")) {
+                                       child.addClassName("Selected");
                                        cb.checked = true;
+                               } else {
+                                       child.removeClassName("Selected");
+                                       cb.checked = false;
                                }
-                       } else if (mode == "unread") {
-                               if (child.className.match("Unread") && !child.className.match("Selected")) {
-                                       child.className = child.className + "Selected";
+                       } else if (mode == "invert") {
+                               if (child.hasClassName("Selected")) {
+                                       child.removeClassName("Selected");
+                                       cb.checked = false;
+                               } else {
+                                       child.addClassName("Selected");
                                        cb.checked = true;
                                }
+
                        } else {
-                               child.className = child.className.replace("Selected", "");
+                               child.removeClassName("Selected");
                                cb.checked = false;
                        }
-               }               
+               });
+
+       } catch (e) {
+               exception_error("selectArticles", e);
        }
 }
 
@@ -1219,15 +1062,9 @@ function catchupPage() {
                return;
        }
 
-       if ($("headlinesList")) {
-               selectTableRowsByIdPrefix('headlinesList', 'RROW-', 'RCHK-', true, 'Unread', true);
-               selectionToggleUnread(false, 'viewCurrentFeed()', true);
-               selectTableRowsByIdPrefix('headlinesList', 'RROW-', 'RCHK-', false);
-       } else {
-               cdmSelectArticles('all');
-               selectionToggleUnread(false, 'viewCurrentFeed()', true)
-               cdmSelectArticles('none');
-       }
+       selectArticles('all');
+       selectionToggleUnread(false, 'viewCurrentFeed()', true)
+       selectArticles('none');
 }
 
 function deleteSelection() {
@@ -1344,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);
@@ -1439,60 +1272,6 @@ function editTagsInsert() {
        }
 }
 
-function cdmScrollViewport(where) {
-       console.log("cdmScrollViewport: " + where);
-
-       var ctr = $("headlinesInnerContainer");
-
-       if (!ctr) return;
-
-       if (where == "bottom") {
-               ctr.scrollTop = ctr.scrollHeight;
-       } else {
-               ctr.scrollTop = where;
-       }
-}
-
-function cdmArticleIsBelowViewport(id) {
-       try {
-               var ctr = $("headlinesInnerContainer");
-               var e = $("RROW-" + id);
-
-               if (!e || !ctr) return;
-
-               // article starts below viewport
-
-               if (ctr.scrollTop < e.offsetTop) {
-                       return true;
-               } else {        
-                       return false;
-               }
-
-       } catch (e) {
-               exception_error("cdmArticleIsVisible", e);
-       }
-}
-
-function cdmArticleIsAboveViewport(id) {
-       try {
-               var ctr = $("headlinesInnerContainer");
-               var e = $("RROW-" + id);
-
-               if (!e || !ctr) return;
-
-               // article starts above viewport
-
-               if (ctr.scrollTop > e.offsetTop + e.offsetHeight) {
-                       return true;
-               } else {        
-                       return false;
-               }
-
-       } catch (e) {
-               exception_error("cdmArticleIsVisible", e);
-       }
-}
-
 function cdmScrollToArticleId(id) {
        try {
                var ctr = $("headlinesInnerContainer");
@@ -1507,36 +1286,6 @@ function cdmScrollToArticleId(id) {
        }
 }
 
-function cdmArticleIsActuallyVisible(id) {
-       try {
-               var ctr = $("headlinesInnerContainer");
-               var e = $("RROW-" + id);
-
-               if (!e || !ctr) return;
-
-               // article fits in viewport OR article is longer than viewport and
-               // its bottom is visible
-
-               if (ctr.scrollTop <= e.offsetTop && e.offsetTop + e.offsetHeight <=
-                               ctr.scrollTop + ctr.offsetHeight) {
-
-                       return true;
-               
-               } else if (e.offsetHeight > ctr.offsetHeight &&
-                               e.offsetTop + e.offsetHeight >= ctr.scrollTop &&
-                               e.offsetTop + e.offsetHeight <= ctr.scrollTop + ctr.offsetHeight) {
-
-                       return true;
-
-               }
-
-               return false;
-
-       } catch (e) {
-               exception_error("cdmArticleIsVisible", e);
-       }
-}
-
 function cdmWatchdog() {
 
        try {
@@ -1550,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
@@ -1594,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");
                                }
                        }
 
@@ -2009,13 +1758,7 @@ function catchupRelativeToArticle(below) {
                        return;
                }
 
-               var visible_ids;
-
-               if ($("headlinesList")) {
-                       visible_ids = getVisibleHeadlineIds();
-               } else {
-                       visible_ids = cdmGetVisibleArticles();
-               }
+               var visible_ids = getVisibleArticleIds();
 
                var ids_to_mark = new Array();
 
@@ -2024,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 {
@@ -2036,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 {
@@ -2054,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" +
@@ -2077,12 +1820,22 @@ function catchupRelativeToArticle(below) {
 function cdmExpandArticle(id) {
        try {
 
+               hideAuxDlg();
+
                var elem = $("CICD-" + active_post_id);
 
+               var upd_img_pic = $("FUPDPIC-" + id);
+
+               if (upd_img_pic && (upd_img_pic.src.match("updated.png") || 
+                               upd_img_pic.src.match("fresh_sign.png"))) {
+
+                       upd_img_pic.src = "images/blank_icon.gif";
+               }
+
                if (id == active_post_id && Element.visible(elem))
                        return true;
 
-               cdmSelectArticles("none");
+               selectArticles("none");
 
                var old_offset = $("RROW-" + id).offsetTop;
 
@@ -2098,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;
@@ -2124,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");
                                }
                        }
                }
@@ -2135,87 +1921,6 @@ function fixHeadlinesOrder(ids) {
        }
 }
 
-function hideReadHeadlines() {
-       try {
-
-               var ids = false;
-               var vis_ids = new Array();
-
-               if ($("headlinesList")) {
-                       ids = getVisibleHeadlineIds();
-               } else {
-                       ids = cdmGetVisibleArticles();
-               }
-
-               var read_headlines_visible = true;
-
-               for (var i = 0; i < ids.length; i++) {
-                       var row = $("RROW-" + ids[i]);
-
-                       if (row && row.className) {
-                               if (read_headlines_visible) {
-                                       if (row.className.match("Unread") || row.className.match("Selected")) {
-                                               Element.show(row);
-                                               vis_ids.push(ids[i]);
-                                       } else {
-                                               //Effect.Fade(row, {duration : 0.3});
-                                               Element.hide(row);
-                                       }
-                               } else {
-                                       Element.show(row);
-                                       vis_ids.push(ids[i]);
-                               }
-                       }
-               }
-               
-               fixHeadlinesOrder(vis_ids);
-
-               read_headlines_visible = !read_headlines_visible;
-
-       } catch (e) {
-               exception_error("hideReadHeadlines", e);
-       } 
-}
-
-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;
 }
@@ -2392,6 +2097,8 @@ function dismissArticle(id) {
 
                new Effect.Fade(elem, {duration : 0.5});
 
+               active_post_id = false;
+
        } catch (e) {
                exception_error("dismissArticle", e);
        }
@@ -2400,16 +2107,27 @@ function dismissArticle(id) {
 function dismissSelectedArticles() {
        try {
 
-               var ids = getSelectedArticleIds2();
+               var ids = getVisibleArticleIds();
+               var tmp = [];
+               var sel = [];
 
                for (var i = 0; i < ids.length; i++) {
                        var elem = $("RROW-" + ids[i]);
-                       new Effect.Fade(elem, {duration : 0.5});
+
+                       if (elem.className && elem.hasClassName("Selected") && 
+                                       ids[i] != active_post_id) {
+                               new Effect.Fade(elem, {duration : 0.5});
+                               sel.push(ids[i]);
+                       } else {
+                               tmp.push(ids[i]);
+                       }
                }
 
-               if (ids.length > 0)
+               if (sel.length > 0)
                        selectionToggleUnread(false);
 
+               fixHeadlinesOrder(tmp);
+
        } catch (e) {
                exception_error("dismissSelectedArticles", e);
        }
@@ -2419,46 +2137,69 @@ function dismissReadArticles() {
        try {
 
                var ids = getVisibleArticleIds();
+               var tmp = [];
 
                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 {
+                               tmp.push(ids[i]);
                        }
                }
 
+               fixHeadlinesOrder(tmp);
+
        } catch (e) {
                exception_error("dismissSelectedArticles", e);
        }
 }
 
 function getVisibleArticleIds() {
+       var ids = [];
+
        try {
-               if (isCdmMode()) {
-                       return cdmGetVisibleArticles();
-               } else {
-                       return getVisibleHeadlineIds();
-               }
+               
+               getLoadedArticleIds().each(function(id) {
+                       var elem = $("RROW-" + id);
+                       if (elem && Element.visible(elem))
+                               ids.push(id);
+                       });
+
        } catch (e) {
-               exception_error("getVisibleArticleIds");
+               exception_error("getVisibleArticleIds", e);
        }
+
+       return ids;
 }
 
 function cdmClicked(event, id) {
        try {
                var shift_key = event.shiftKey;
 
+               hideAuxDlg();
+
                if (!event.ctrlKey) {
-                       cdmSelectArticles("none");
+                       selectArticles("none");
                        toggleSelected(id);
 
                        var elem = $("RROW-" + id);
 
                        if (elem)
-                               elem.className = elem.className.replace("Unread", "");
+                               elem.removeClassName("Unread");
+
+                       var upd_img_pic = $("FUPDPIC-" + id);
+
+                       if (upd_img_pic && (upd_img_pic.src.match("updated.png") || 
+                                       upd_img_pic.src.match("fresh_sign.png"))) {
+
+                               upd_img_pic.src = "images/blank_icon.gif";
+                       }
+
+                       active_post_id = id;
 
                        var query = "?op=rpc&subop=catchupSelected" +
                                "&cmode=0&ids=" + param_escape(id);
@@ -2483,7 +2224,6 @@ function cdmClicked(event, id) {
 
 function hlClicked(event, id) {
        try {
-               var shift_key = event.shiftKey;
 
                if (!event.ctrlKey) {
                        view(id);
@@ -2499,3 +2239,137 @@ function hlClicked(event, id) {
 
        return false;
 }
+
+function getFirstVisibleHeadlineId() {
+       var rows = getVisibleArticleIds();
+       return rows[0];
+       
+}
+
+function getLastVisibleHeadlineId() {
+       var rows = getVisibleArticleIds();
+       return rows[rows.length-1];
+}
+
+function openArticleInNewWindow(id) {
+       try {
+               console.log("openArticleInNewWindow: " + id);
+
+               var query = "?op=rpc&subop=getArticleLink&id=" + id;
+               var wname = "ttrss_article_" + id;
+
+               console.log(query + " " + wname);
+
+               var w = window.open("", wname);
+
+               if (!w) notify_error("Failed to open window for the article");
+
+               new Ajax.Request("backend.php", {
+                       parameters: query,
+                       onComplete: function(transport) { 
+
+                                       var link = transport.responseXML.getElementsByTagName("link")[0];
+                                       var id = transport.responseXML.getElementsByTagName("id")[0];
+               
+                                       console.log("open_article received link: " + link);
+               
+                                       if (link && id) {
+               
+                                               var wname = "ttrss_article_" + id.firstChild.nodeValue;
+               
+                                               console.log("link url: " + link.firstChild.nodeValue + ", wname " + wname);
+               
+                                               var w = window.open(link.firstChild.nodeValue, wname);
+               
+                                               if (!w) { notify_error("Failed to load article in new window"); }
+               
+                                               if (id) {
+                                                       id = id.firstChild.nodeValue;
+                                                       window.setTimeout("toggleUnread(" + id + ", 0)", 100);
+                                               }
+                                       } else {
+                                               notify_error("Can't open article: received invalid article link");
+                                       }
+                               } });
+
+       } catch (e) {
+               exception_error("openArticleInNewWindow", e);
+       }
+}
+
+function isCdmMode() {
+       return getInitParam("combined_display_mode");
+}
+
+function markHeadline(id) {
+       var row = $("RROW-" + id);
+       if (row) {
+               var check = $("RCHK-" + id);
+
+               if (check) {
+                       check.checked = true;
+               }
+
+               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);
+       }
+
+}
+
+