]> git.wh0rd.org - tt-rss.git/blobdiff - viewfeed.js
remove modalbox; use dijit.Dialog; further dojo-related updates
[tt-rss.git] / viewfeed.js
index f06c99444ecc85bdfcf2a8b7a7b9e72b3da05ebe..209e84ebbb9f571ac23380b1dc60a74cb62127f9 100644 (file)
@@ -69,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");
                        } 
                }
 
@@ -97,6 +97,10 @@ function headlines_callback2(transport, feed_cur_page) {
                        var response = transport.responseXML;
 
                        var headlines = response.getElementsByTagName("headlines")[0];
+
+                       var headlines_content = headlines.getElementsByTagName("content")[0];
+                       var headlines_toolbar = headlines.getElementsByTagName("toolbar")[0];
+                       
                        var headlines_info = response.getElementsByTagName("headlines-info")[0];
 
                        if (headlines_info)
@@ -112,7 +116,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;
@@ -124,7 +128,10 @@ function headlines_callback2(transport, feed_cur_page) {
        
                        if (feed_cur_page == 0) {
                                if (headlines) {
-                                       f.innerHTML = headlines.firstChild.nodeValue;
+                                       $("headlinesInnerContainer").innerHTML = headlines_content.firstChild.nodeValue;
+                                       $("headlines-toolbar").innerHTML = headlines_toolbar.firstChild.nodeValue;
+
+                                       dijit.byId("main").resize();
 
                                        var cache_prefix = "";
 
@@ -254,9 +261,9 @@ function showArticleInHeadlines(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');
 
@@ -360,10 +367,6 @@ function article_callback2(transport, id) {
 
 //                     showArticleInHeadlines(id);     
 
-                       if (db) {
-                               db.execute("UPDATE articles SET unread = 0 WHERE id = ?", [id]);
-                       }
-
                        var reply = transport.responseXML.firstChild.firstChild;
                
                } else {
@@ -392,8 +395,6 @@ function view(id) {
        try {
                console.log("loading article: " + id);
 
-               if (offline_mode) return view_offline(id);
-
                var cached_article = cache_find(id);
 
                console.log("cache check result: " + (cached_article != false));
@@ -420,7 +421,7 @@ function view(id) {
                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);
@@ -518,22 +519,12 @@ function toggleMark(id, client_only) {
                        img.alt = __("Unstar article");
                        query = query + "&mark=1";
 
-                       if (db) {
-                               db.execute("UPDATE articles SET marked = 1 WHERE id = ?", [id]);
-                       }
-
                } else {
                        img.src = img.src.replace("mark_set", "mark_unset");
                        img.alt = __("Star article");
                        query = query + "&mark=0";
-
-                       if (db) {
-                               db.execute("UPDATE articles SET marked = 0 WHERE id = ?", [id]);
-                       }
                }
 
-               update_local_feedlist_counters();
-
                if (!client_only) {
                        new Ajax.Request("backend.php", {
                                parameters: query,
@@ -668,28 +659,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);
@@ -712,24 +691,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",
@@ -738,16 +702,12 @@ function toggleUnread(id, cmode, effect) {
                                        } 
 
                                } else {
-                                       row.className = nc + "Unread";
-                               }
-
-                               if (db) {
-                                       db.execute("UPDATE articles SET unread = not unread "+
-                                               "WHERE id = ?", [id]);
+                                       row.addClassName("Unread");
                                }
 
                        } else if (cmode == 0) {
-                               row.className = nc;
+
+                               row.removeClassName("Unread");
 
                                if (effect) {
                                        new Effect.Highlight(row, {duration: 1, startcolor: "#fff7d5",
@@ -755,26 +715,10 @@ function toggleUnread(id, cmode, effect) {
                                                queue: { position:'end', scope: 'TMRQ-' + id, limit: 1 } } );
                                } 
 
-                               if (db) {
-                                       db.execute("UPDATE articles SET unread = 0 "+
-                                               "WHERE id = ?", [id]);
-                               }
-
                        } else if (cmode == 1) {
-                               row.className = nc + "Unread";
-
-                               if (db) {
-                                       db.execute("UPDATE articles SET unread = 1 "+
-                                               "WHERE id = ?", [id]);
-                               }
-
+                               row.addClassName("Unread");
                        }
 
-                       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" +
@@ -883,44 +827,26 @@ 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";
-                                       }
-                                       if (db) {
-                                               db.execute("UPDATE articles SET unread = NOT unread WHERE id = ?", 
-                                                       [rows[i]]);
+                                               row.addClassName("Unread");
                                        }
                                }
 
                                if (set_state == false) {
-                                       row.className = nc + "Selected";
-                                       if (db) {
-                                               db.execute("UPDATE articles SET unread = 0 WHERE id = ?", 
-                                                       [rows[i]]);
-                                       }
+                                       row.removeClassName("Unread");
                                }
 
                                if (set_state == true) {
-                                       row.className = nc + "UnreadSelected";
-                                       if (db) {
-                                               db.execute("UPDATE articles SET unread = 1 WHERE id = ?", 
-                                                       [rows[i]]);
-                                       }
+                                       row.addClassName("Unread");
                                }
                        }
                }
 
                if (rows.length > 0) {
 
-                       update_local_feedlist_counters();
-
                        var cmode = "";
 
                        if (set_state == undefined) {
@@ -963,8 +889,6 @@ function selectionToggleMarked() {
                        toggleMark(rows[i], true, true);
                }
 
-               update_local_feedlist_counters();
-
                if (rows.length > 0) {
 
                        var query = "?op=rpc&subop=markSelected&ids=" +
@@ -1016,84 +940,65 @@ function selectionTogglePublished() {
 }
 
 function getSelectedArticleIds2() {
-       var sel_articles = new Array();
-
-       var children;
-       
-       var children = $("headlinesInnerContainer").childNodes;
 
-       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();
+       var rv = [];
 
-       var children = $("headlinesInnerContainer").childNodes;
+       var children = $$("#headlinesInnerContainer > div[id*=RROW-]");
 
-       if (!children) return sel_articles;
+       children.each(function(child) {
+                       rv.push(child.id.replace("RROW-", ""));
+               });
 
-       for (i = 0; i < children.length; i++) {
-               var child = children[i];
+       return rv;
 
-               if (child.id && child.id.match("RROW-")) {
-                       var c_id = child.id.replace("RROW-", "");
-                       sel_articles.push(c_id);
-               }
-       }
-
-       return sel_articles;
 }
 
 // mode = all,none,unread,invert
 function selectArticles(mode) {
        try {
 
-               var children;
-       
-               var children = $("headlinesInnerContainer").childNodes;
+               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);
@@ -1349,7 +1254,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
@@ -1393,7 +1298,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");
                                }
                        }
 
@@ -1426,28 +1331,21 @@ function cache_inject(id, article, param) {
                   var date = new Date();
              var ts = Math.round(date.getTime() / 1000);
 
-                       if (db) {
-
-                               db.execute("INSERT INTO cache (id, article, param, added) VALUES (?, ?, ?, ?)",
-                                       [id, article, param, ts]);                              
-                       } else {
+                       var cache_obj = {};
        
-                               var cache_obj = {};
-       
-                               cache_obj["id"] = id;
-                               cache_obj["data"] = article;
-                               cache_obj["param"] = param;
+                       cache_obj["id"] = id;
+                       cache_obj["data"] = article;
+                       cache_obj["param"] = param;
 
-                               if (param) id = id + ":" + param;
+                       if (param) id = id + ":" + param;
 
-                               cache_added["TS:" + id] = ts;
+                       cache_added["TS:" + id] = ts;
+
+                       if (has_local_storage()) 
+                               localStorage.setItem(id, JSON.stringify(cache_obj));
+                       else
+                               article_cache.push(cache_obj);
 
-                               if (has_local_storage()) 
-                                       localStorage.setItem(id, JSON.stringify(cache_obj));
-                               else
-                                       article_cache.push(cache_obj);
-                       }
-       
                } else {
                        //console.log("cache_article: hit: " + id + " [p=" + param + "]");
                }
@@ -1458,35 +1356,20 @@ function cache_inject(id, article, param) {
 
 function cache_find(id) {
 
-       if (db) {
-               var rs = db.execute("SELECT article FROM cache WHERE id = ?", [id]);
-               var a = false;
-
-               if (rs.isValidRow()) {
-                       var a = rs.field(0);                    
-               }
+       if (has_local_storage()) {
+               var cache_obj = localStorage.getItem(id);
 
-               rs.close();
+               if (cache_obj) {
+                       cache_obj = JSON.parse(cache_obj);
 
-               return a;
+                       if (cache_obj)
+                               return cache_obj['data'];
+               }
 
        } else {
-
-               if (has_local_storage()) {
-                       var cache_obj = localStorage.getItem(id);
-       
-                       if (cache_obj) {
-                               cache_obj = JSON.parse(cache_obj);
-
-                               if (cache_obj)
-                                       return cache_obj['data'];
-                       }
-
-               } else {
-                       for (var i = 0; i < article_cache.length; i++) {
-                               if (article_cache[i]["id"] == id) {
-                                       return article_cache[i]["data"];
-                               }
+               for (var i = 0; i < article_cache.length; i++) {
+                       if (article_cache[i]["id"] == id) {
+                               return article_cache[i]["data"];
                        }
                }
        }
@@ -1495,69 +1378,38 @@ function cache_find(id) {
 
 function cache_find_param(id, param) {
 
-       if (db) {
-               var rs = db.execute("SELECT article FROM cache WHERE id = ? AND param = ?",
-                       [id, param]);
-               var a = false;
+       if (has_local_storage()) {
 
-               if (rs.isValidRow()) {
-                       a = rs.field(0);
-               }
-
-               rs.close();
+               if (param) id = id + ":" + param;
 
-               return a;
+               var cache_obj = localStorage.getItem(id);
 
-       } else {
-
-               if (has_local_storage()) {
+               if (cache_obj) {
+                       cache_obj = JSON.parse(cache_obj);
 
-                       if (param) id = id + ":" + param;
-
-                       var cache_obj = localStorage.getItem(id);
-
-                       if (cache_obj) {
-                               cache_obj = JSON.parse(cache_obj);
-
-                               if (cache_obj)
-                                       return cache_obj['data'];
-                       }
+                       if (cache_obj)
+                               return cache_obj['data'];
+               }
 
-               } else {
-                       for (var i = 0; i < article_cache.length; i++) {
-                               if (article_cache[i]["id"] == id && article_cache[i]["param"] == param) {
-                                       return article_cache[i]["data"];
-                               }
+       } else {
+               for (var i = 0; i < article_cache.length; i++) {
+                       if (article_cache[i]["id"] == id && article_cache[i]["param"] == param) {
+                               return article_cache[i]["data"];
                        }
                }
        }
+
        return false;
 }
 
 function cache_check(id) {
-
-       if (db) {
-               var rs = db.execute("SELECT COUNT(*) AS c FROM cache WHERE id = ?",
-                       [id]);
-               var a = false;
-
-               if (rs.isValidRow()) {
-                        a = rs.field(0) != "0";
-               }
-
-               rs.close();
-
-               return a;
-
+       if (has_local_storage()) {
+               if (localStorage.getItem(id))
+                       return true;
        } else {
-               if (has_local_storage()) {
-                       if (localStorage.getItem(id))
+               for (var i = 0; i < article_cache.length; i++) {
+                       if (article_cache[i]["id"] == id) {
                                return true;
-               } else {
-                       for (var i = 0; i < article_cache.length; i++) {
-                               if (article_cache[i]["id"] == id) {
-                                       return true;
-                               }
                        }
                }
        }
@@ -1565,34 +1417,17 @@ function cache_check(id) {
 }
 
 function cache_check_param(id, param) {
+       if (has_local_storage()) {
 
-       if (db) {
-               var rs = db.execute("SELECT COUNT(*) AS c FROM cache WHERE id = ? AND param = ?",
-                       [id, param]);
-               var a = false;
-
-               if (rs.isValidRow()) {
-                       a = rs.field(0) != "0";
-               }
+               if (param) id = id + ":" + param;
 
-               rs.close();
-
-               return a;
+               if (localStorage.getItem(id))
+                       return true;
 
        } else {
-
-               if (has_local_storage()) {
-
-                       if (param) id = id + ":" + param;
-
-                       if (localStorage.getItem(id))
+               for (var i = 0; i < article_cache.length; i++) {
+                       if (article_cache[i]["id"] == id && article_cache[i]["param"] == param) {
                                return true;
-
-               } else {
-                       for (var i = 0; i < article_cache.length; i++) {
-                               if (article_cache[i]["id"] == id && article_cache[i]["param"] == param) {
-                                       return true;
-                               }
                        }
                }
        }
@@ -1600,42 +1435,29 @@ function cache_check_param(id, param) {
 }
 
 function cache_expire() {
-       if (db) {
-               var date = new Date();
-               var ts = Math.round(date.getTime() / 1000);
-
-               db.execute("DELETE FROM cache WHERE added < ? - 1800 AND id LIKE 'FEEDLIST'", [ts]);
-               db.execute("DELETE FROM cache WHERE added < ? - 600 AND (id LIKE 'F:%' OR id LIKE 'C:%')", [ts]);
-               db.execute("DELETE FROM cache WHERE added < ? - 86400", [ts]);
+if (has_local_storage()) {
 
+               var date = new Date();
+               var timestamp = Math.round(date.getTime() / 1000);
 
-       } else {
-               if (has_local_storage()) {
-
-                       var date = new Date();
-                       var timestamp = Math.round(date.getTime() / 1000);
+               for (var i = 0; i < localStorage.length; i++) {
 
-                       for (var i = 0; i < localStorage.length; i++) {
+                       var id = localStorage.key(i);
 
-                               var id = localStorage.key(i);
-
-                               if (timestamp - cache_added["TS:" + id] > 180) {
-                                       localStorage.removeItem(id);
-                               }
+                       if (timestamp - cache_added["TS:" + id] > 180) {
+                               localStorage.removeItem(id);
                        }
+               }
 
-               } else {
-                       while (article_cache.length > 25) {
-                               article_cache.shift();
-                       }
+       } else {
+               while (article_cache.length > 25) {
+                       article_cache.shift();
                }
        }
 }
 
 function cache_flush() {
-       if (db) {
-               db.execute("DELETE FROM cache");
-       } else if (has_local_storage()) {
+       if (has_local_storage()) {
                localStorage.clear();
        } else {
                article_cache = new Array();
@@ -1644,41 +1466,34 @@ function cache_flush() {
 
 function cache_invalidate(id) {
        try {   
+               if (has_local_storage()) {
 
-               if (db) {
-                       rs = db.execute("DELETE FROM cache WHERE id = ?", [id]);
-                       return rs.rowsAffected != 0;
-               } else {
-
-                       if (has_local_storage()) {
-
-                               var found = false;
+                       var found = false;
 
-                               for (var i = 0; i < localStorage.length; i++) {
-                                       var key = localStorage.key(i);
+                       for (var i = 0; i < localStorage.length; i++) {
+                               var key = localStorage.key(i);
 
 //                                     console.warn("cache_invalidate: " + key_id + " cmp " + id);
 
-                                       if (key == id || key.indexOf(id + ":") == 0) {
-                                               localStorage.removeItem(key);
-                                               found = true;
-                                               break;
-                                       }
+                               if (key == id || key.indexOf(id + ":") == 0) {
+                                       localStorage.removeItem(key);
+                                       found = true;
+                                       break;
                                }
+                       }
 
-                               return found;
+                       return found;
 
-                       } else {
-                               var i = 0
+               } else {
+                       var i = 0
 
-                               while (i < article_cache.length) {
-                                       if (article_cache[i]["id"] == id) {
-                                               //console.log("cache_invalidate: removed id " + id);
-                                               article_cache.splice(i, 1);
-                                               return true;
-                                       }
-                                       i++;
+                       while (i < article_cache.length) {
+                               if (article_cache[i]["id"] == id) {
+                                       //console.log("cache_invalidate: removed id " + id);
+                                       article_cache.splice(i, 1);
+                                       return true;
                                }
+                               i++;
                        }
                }
 
@@ -1817,7 +1632,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 {
@@ -1829,7 +1644,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 {
@@ -1847,7 +1662,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" +
@@ -1958,9 +1773,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");
                                }
                        }
                }
@@ -2162,7 +1979,7 @@ 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]);
@@ -2190,8 +2007,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 {
@@ -2210,13 +2027,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);
@@ -2238,7 +2054,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);
 
@@ -2248,6 +2064,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);
 
@@ -2351,27 +2169,13 @@ function isCdmMode() {
 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");
        }
 }