]> git.wh0rd.org - tt-rss.git/blobdiff - digest.js
reduce the number of always included libraries
[tt-rss.git] / digest.js
index 777473c61f68cd5b068f46df1012946f8ea86792..7dba6d36ee0b60cbc9dc7de45f4abbd0cec08c3a 100644 (file)
--- a/digest.js
+++ b/digest.js
@@ -1,9 +1,19 @@
 var last_feeds = [];
+var init_params = {};
 
 var _active_feed_id = false;
-var _active_feed_offset = false;
 var _update_timeout = false;
+var _view_update_timeout = false;
 var _feedlist_expanded = false;
+var _update_seq = 1;
+
+function article_appear(article_id) {
+       try {
+               new Effect.Appear('A-' + article_id);
+       } catch (e) {
+               exception_error("article_appear", e);
+       }
+}
 
 function catchup_feed(feed_id, callback) {
        try {
@@ -14,16 +24,16 @@ function catchup_feed(feed_id, callback) {
 
                        var is_cat = "";
 
-                       if (feed_id == -4) is_cat = "true";
+                       if (feed_id < 0) is_cat = "true"; // KLUDGE
 
-                       var query = "?op=rpc&subop=catchupFeed&feed_id=" + 
+                       var query = "?op=rpc&subop=catchupFeed&feed_id=" +
                                feed_id + "&is_cat=" + is_cat;
 
                        new Ajax.Request("backend.php", {
-                               parameters: query, 
+                               parameters: query,
                                onComplete: function(transport) {
                                        if (callback) callback(transport);
-       
+
                                        update();
                                } });
                }
@@ -33,6 +43,48 @@ function catchup_feed(feed_id, callback) {
        }
 }
 
+function get_visible_article_ids() {
+       try {
+               var elems = $("headlines-content").getElementsByTagName("LI");
+               var ids = [];
+
+               for (var i = 0; i < elems.length; i++) {
+                       if (elems[i].id && elems[i].id.match("A-")) {
+                       ids.push(elems[i].id.replace("A-", ""));
+                       }
+               }
+
+               return ids;
+
+       } catch (e) {
+               exception_error("get_visible_article_ids", e);
+       }
+}
+
+function catchup_visible_articles(callback) {
+       try {
+
+               var ids = get_visible_article_ids();
+
+               if (confirm(__("Mark %d displayed articles as read?").replace("%d", ids.length))) {
+
+                       var query = "?op=rpc&subop=catchupSelected" +
+                               "&cmode=0&ids=" + param_escape(ids);
+
+                       new Ajax.Request("backend.php", {
+                               parameters: query,
+                               onComplete: function(transport) {
+                                       if (callback) callback(transport);
+
+                                       viewfeed(_active_feed_id, 0);
+                               } });
+
+                       }
+
+       } catch (e) {
+               exception_error("catchup_visible_articles", e);
+       }
+}
 
 function catchup_article(article_id, callback) {
        try {
@@ -40,7 +92,7 @@ function catchup_article(article_id, callback) {
                        "&cmode=0&ids=" + article_id;
 
                new Ajax.Request("backend.php", {
-                       parameters: query, 
+                       parameters: query,
                        onComplete: function(transport) {
                                if (callback) callback(transport);
                        } });
@@ -50,6 +102,29 @@ function catchup_article(article_id, callback) {
        }
 }
 
+function set_selected_article(article_id) {
+       try {
+               $$("#headlines-content > li[id*=A-]").each(function(article) {
+                               var id = article.id.replace("A-", "");
+
+                               var cb = article.getElementsByTagName("INPUT")[0];
+
+                               if (id == article_id) {
+                                       article.addClassName("selected");
+                                       cb.checked = true;
+                               } else {
+                                       article.removeClassName("selected");
+                                       cb.checked = false;
+                               }
+
+               });
+
+       } catch (e) {
+               exception_error("mark_selected_feed", e);
+       }
+}
+
+
 function set_selected_feed(feed_id) {
        try {
                var feeds = $("feeds-content").getElementsByTagName("LI");
@@ -68,39 +143,26 @@ function set_selected_feed(feed_id) {
        }
 }
 
-function zoom(article_id) {
+function load_more() {
        try {
-               var elem = $('A-' + article_id);
+               var pr = $("H-LOADING-IMG");
 
-               if (elem) {
-                       var divs = elem.getElementsByTagName('DIV');
-                       
-                       for (var i = 0; i < divs.length; i++) {
-                               if (divs[i].className == 'excerpt') 
-                                       Element.hide(divs[i]);
-
-                               if (divs[i].className == 'content') 
-                                       Element.show(divs[i]);
-                       }
-               }
+               if (pr) Element.show(pr);
 
-               catchup_article(article_id, 
-                       function() { update(); });
+               var offset = $$("#headlines-content > li[id*=A-][class*=fresh],li[id*=A-][class*=unread]").length;
 
-       } catch (e) {
-               exception_error("zoom", e);
-       }
-}
+               viewfeed(false, offset, false, false, true,
+                       function() {
+                               var pr = $("H-LOADING-IMG");
 
-function load_more() {
-       try {
-               viewfeed(_active_feed_id, _active_feed_offset + 10);
+                               if (pr) Element.hide(pr);
+                       });
        } catch (e) {
                exception_error("load_more", e);
        }
 }
 
-function update() {
+function update(callback) {
        try {
                console.log('updating feeds...');
 
@@ -112,6 +174,8 @@ function update() {
                                fatal_error_check(transport);
                                parse_feeds(transport);
                                set_selected_feed(_active_feed_id);
+
+                               if (callback) callback(transport);
                                } });
 
                _update_timeout = window.setTimeout('update()', 5*1000);
@@ -133,40 +197,156 @@ function remove_headline_entry(article_id) {
        }
 }
 
-function view(article_id, dismiss_only) {
+function view_update() {
+       try {
+               viewfeed(_active_feed_id, _active_feed_offset, false, true, true);
+               update();
+       } catch (e) {
+               exception_error("view_update", e);
+       }
+}
+
+function view(article_id) {
        try {
-               remove_headline_entry(article_id);
+               $("content").addClassName("move");
+
+               var a = $("A-" + article_id);
+               var h = $("headlines");
+
+               setTimeout(function() {
+                       // below or above viewport, reposition headline
+                       if (a.offsetTop > h.scrollTop + h.offsetHeight || a.offsetTop+a.offsetHeight < h.scrollTop+a.offsetHeight)
+                               h.scrollTop = a.offsetTop - (h.offsetHeight/2 - a.offsetHeight/2);
+                       }, 500);
+
+               new Ajax.Request("backend.php", {
+                       parameters: "?op=rpc&subop=digest-get-contents&article_id=" +
+                               article_id,
+                       onComplete: function(transport) {
+                               fatal_error_check(transport);
+
+                               var reply = JSON.parse(transport.responseText);
+
+                               if (reply) {
+                                       var article = reply['article'];
+
+                                       var mark_part = "";
+                                       var publ_part = "";
+
+                                       var tags_part = "";
 
-               catchup_article(article_id, 
-                       function() { update(); });
+                                       if (article.tags.length > 0) {
+                                               tags_part = " " + __("in") + " ";
 
-               return dismiss_only != true;
+                                               for (var i = 0; i < Math.min(5, article.tags.length); i++) {
+                                                       //tags_part += "<a href=\"#\" onclick=\"viewfeed('" +
+                                                       //              article.tags[i] + "')\">" +
+                                                       //      article.tags[i] + "</a>, ";
+
+                                                       tags_part += article.tags[i] + ", ";
+                                               }
+
+                                               tags_part = tags_part.replace(/, $/, "");
+                                               tags_part = "<span class=\"tags\">" + tags_part + "</span>";
+
+                                       }
+
+                                       if (article.marked)
+                                               mark_part = "<img title='"+ __("Unstar article")+"' onclick=\"toggle_mark(this, "+article.id+")\" src='images/mark_set.png'>";
+                                       else
+                                               mark_part =     "<img title='"+__("Star article")+"' onclick=\"toggle_mark(this, "+article.id+")\" src='images/mark_unset.png'>";
+
+                                       if (article.published)
+                                               publ_part = "<img title='"+__("Unpublish article")+"' onclick=\"toggle_pub(this, "+article.id+")\" src='images/pub_set.png'>";
+                                       else
+                                               publ_part =     "<img title='"+__("Publish article")+"' onclick=\"toggle_pub(this, "+article.id+")\" src='images/pub_unset.png'>";
+
+                                       var tmp = "<div id=\"toolbar\">" +
+                                               "<a target=\"_blank\" href=\""+article.url+"\">" + __("Original article") + "</a>" +
+                                               "<div style=\"float : right\"><a href=\"#\" onclick=\"close_article()\">" +
+                                               __("Close this panel") + "</a></div></div>" +
+                                               "<div id=\"inner\">" +
+                                               "<div id=\"ops\">" +
+                                               mark_part +
+                                               publ_part +
+                                               "</div>" +
+                                               "<h1>" + article.title + "</h1>" +
+                                               "<div id=\"tags\">" +
+                                               tags_part +
+                                               "</div>" +
+                                               article.content + "</div>";
+
+                                       $("article-content").innerHTML = tmp;
+                                       $("article").addClassName("visible");
+
+                                       set_selected_article(article.id);
+
+                                       catchup_article(article_id,
+                                               function() {
+                                                       $("A-" + article_id).addClassName("read");
+                                       });
+
+                               } else {
+                                       elem.innerHTML = __("Error: unable to load article.");
+                               }
+                       }
+               });
+
+
+               return false;
        } catch (e) {
                exception_error("view", e);
        }
 }
 
-function viewfeed(feed_id, offset) {
+function close_article() {
+       $("content").removeClassName("move");
+       $("article").removeClassName("visible");
+}
+
+function viewfeed(feed_id, offset, replace, no_effects, no_indicator, callback) {
        try {
 
                if (!feed_id) feed_id = _active_feed_id;
+               if (offset == undefined) offset = 0;
+               if (replace == undefined) replace = (offset == 0);
 
-               if (!offset) {
-                       offset = 0;
-               } else {
-                       offset = _active_feed_offset + offset;
-               }
+               _update_seq = _update_seq + 1;
+
+               if (!offset) $("headlines").scrollTop = 0;
+
+               var query = "backend.php?op=rpc&subop=digest-update&feed_id=" +
+                               param_escape(feed_id) + "&offset=" + offset +
+                               "&seq=" + _update_seq;
 
-               var query = "backend.php?op=rpc&subop=digest-update&feed_id=" + feed_id +
-                               "&offset=" + offset;
+               console.log(query);
+
+               var img = false;
+               
+               if ($("F-" + feed_id)) {
+                       img = $("F-" + feed_id).getElementsByTagName("IMG")[0];
+
+                       if (img && !no_indicator) {
+                               img.setAttribute("orig_src", img.src);
+                               img.src = 'images/indicator_tiny.gif';
+                       }
+               }
 
                new Ajax.Request("backend.php", {
-                       parameters: query, 
+                       parameters: query,
                        onComplete: function(transport) {
+                               Element.hide("overlay");
+
                                fatal_error_check(transport);
-                               parse_headlines(transport, offset == 0);
+                               parse_headlines(transport, replace, no_effects);
                                set_selected_feed(feed_id);
                                _active_feed_offset = offset;
+
+                               if (img && !no_indicator)
+                                       img.src = img.getAttribute("orig_src");
+
+                               if (callback) callback(transport);
+
                        } });
 
        } catch (e) {
@@ -205,7 +385,7 @@ function find_feed(feeds, feed_id) {
 function get_feed_icon(feed) {
        try {
                if (feed.has_icon)
-                       return 'icons/' + feed.id + '.ico';
+                       return getInitParam('icons_url') + "/" + feed.id + '.ico';
 
                if (feed.id == -1)
                        return 'images/mark_set.png';
@@ -216,10 +396,10 @@ function get_feed_icon(feed) {
                if (feed.id == -3)
                        return 'images/fresh.png';
 
-               if (feed.id == -4) 
+               if (feed.id == -4)
                        return 'images/tag.png';
 
-               if (feed.id < -10) 
+               if (feed.id < -10)
                        return 'images/label.png';
 
                return 'images/blank_icon.gif';
@@ -235,52 +415,74 @@ function add_feed_entry(feed) {
 
                icon_part = "<img src='" + get_feed_icon(feed) + "'/>";
 
-               var tmp_html = "<li id=\"F-"+feed.id+"\" " +
-                               "onmouseover=\"feed_mi(this)\" onmouseout=\"feed_mo(this)\">" + 
-                       icon_part +
-                       "<a href=\"#\" onclick=\"viewfeed("+feed.id+")\">" + feed.title + "</a>" +
-                       "<div class='unread-ctr'>" + 
-                               "<img onclick=\"catchup_feed("+feed.id+")\" title=\"Dismiss\" class=\"dismiss\" style='display : none' src=\"images/digest_checkbox.png\">" +
-                               "<span class=\"unread\">" + feed.unread + "</span>" + 
-                       "</div>" +      
-                       "</li>";
+               var tmp_html = "<li id=\"F-"+feed.id+"\" onclick=\"viewfeed("+feed.id+")\">" +
+                       icon_part + feed.title +
+                       "<div class='unread-ctr'>" + "<span class=\"unread\">" + feed.unread + "</span>" +
+                       "</div>" + "</li>";
 
                $("feeds-content").innerHTML += tmp_html;
 
+
        } catch (e) {
                exception_error("add_feed_entry", e);
        }
 }
 
-function add_headline_entry(article, feed) {
+function add_headline_entry(article, feed, no_effects) {
        try {
 
                var icon_part = "";
 
                icon_part = "<img class='icon' src='" + get_feed_icon(feed) + "'/>";
 
-               var tmp_html = "<li id=\"A-"+article.id+"\">" + 
+
+               var style = "";
+
+               //if (!no_effects) style = "style=\"display : none\"";
+
+               if (article.excerpt.trim() == "")
+                       article.excerpt = __("Click to expand article.");
+
+               var li_class = "unread";
+
+               var fresh_max = getInitParam("fresh_article_max_age") * 60 * 60;
+               var d = new Date();
+
+               if (d.getTime() / 1000 - article.updated < fresh_max)
+                       li_class = "fresh";
+
+               //"<img title='" + __("Share on Twitter") + "' onclick=\"tweet_article("+article.id+", true)\" src='images/art-tweet.png'>" +
+
+               //"<img title='" + __("Mark as read") + "' onclick=\"view("+article.id+", true)\" src='images/digest_checkbox.png'>" +
+
+               var checkbox_part = "<input type=\"checkbox\" class=\"cb\" onclick=\"toggle_select_article(this)\"/>";
+
+               var date = new Date(article.updated * 1000);
+
+               var date_part = date.toString().substring(0,21);
+
+               var tmp_html = "<li id=\"A-"+article.id+"\" "+style+" class=\""+li_class+"\">" +
+                       checkbox_part +
                        icon_part +
-                       "<div class='digest-check'>" +
-                       "<img title='Set starred' onclick=\"toggleMark(this, "+article.id+")\" src='images/mark_unset.png'>" +
-                       "<img title='Set published' onclick=\"togglePub(this, "+article.id+")\" src='images/pub_unset.png'>" +
-                       "<img title='Dismiss' onclick=\"view("+article.id+", true)\" class='digest-check' src='images/digest_checkbox.png'>" +
-                       "</div>" + 
                        "<a target=\"_blank\" href=\""+article.link+"\""+
-                               "onclick=\"return view("+article.id+")\" class='title'>" + 
+                               "onclick=\"return view("+article.id+")\" class='title'>" +
                                article.title + "</a>" +
-                       "<div class='body'>" + 
-                       "<div title=\"Click to expand article\" onclick=\"zoom("+article.id+")\" class='excerpt'>" + 
+                       "<div class='body'>" +
+                       "<div onclick=\"view("+article.id+")\" class='excerpt'>" +
                                article.excerpt + "</div>" +
-                       "<div style='display : none' class='content'>" + 
-                               article.content + "</div>" +
-                       "<div class='info'><a href=\#\" onclick=\"viewfeed("+feed.id+")\">" + 
-                               feed.title + "</a> " + " @ " + 
-                               new Date(article.updated * 1000) + "</div>" +
+                       "<div class='info'>";
+
+/*             tmp_html += "<a href=\#\" onclick=\"viewfeed("+feed.id+")\">" +
+                                       feed.title + "</a> " + " @ "; */
+
+               tmp_html += date_part + "</div>" +
                        "</div></li>";
 
                $("headlines-content").innerHTML += tmp_html;
 
+               if (!no_effects)
+                       window.setTimeout('article_appear(' + article.id + ')', 100);
+
        } catch (e) {
                exception_error("add_headline_entry", e);
        }
@@ -312,12 +514,21 @@ function redraw_feedlist(feeds) {
 
                if (feeds.length > limit) {
                        $('feeds-content').innerHTML += "<li id='F-MORE-PROMPT'>" +
-                               "<img src='images/blank_icon.gif'>" + 
+                               "<img src='images/blank_icon.gif'>" +
                                "<a href=\"#\" onclick=\"expand_feeds()\">" +
-                               __("%d more...").replace("%d", feeds.length-10) + 
+                               __("%d more...").replace("%d", feeds.length-10) +
                                "</a>" + "</li>";
                }
 
+               if (feeds.length == 0) {
+                       $('feeds-content').innerHTML =
+                               "<div class='insensitive' style='text-align : center'>" +
+                                       __("No unread feeds.") + "</div>";
+               }
+
+               if (_active_feed_id)
+                       set_selected_feed(_active_feed_id);
+
        } catch (e) {
                exception_error("redraw_feedlist", e);
        }
@@ -325,25 +536,25 @@ function redraw_feedlist(feeds) {
 
 function parse_feeds(transport) {
        try {
+               var reply = JSON.parse(transport.responseText);
 
-               if (!transport.responseXML) return;
+               if (!reply) return;
 
-               var feeds = transport.responseXML.getElementsByTagName('feeds')[0];
+               var feeds = reply['feeds'];
 
                if (feeds) {
-                       feeds = eval("(" + feeds.firstChild.nodeValue + ")");
 
-                       feeds.sort( function (a,b) 
-                               { 
+                       feeds.sort( function (a,b)
+                               {
                                        if (b.unread != a.unread)
-                                               return (b.unread - a.unread) 
+                                               return (b.unread - a.unread);
                                        else
                                                if (a.title > b.title)
                                                        return 1;
                                                else if (a.title < b.title)
                                                        return -1;
                                                else
-                                                       return 0;                                       
+                                                       return 0;
                                });
 
                        var all_articles = find_feed(feeds, -4);
@@ -360,38 +571,73 @@ function parse_feeds(transport) {
        }
 }
 
-function parse_headlines(transport, replace) {
+function parse_headlines(transport, replace, no_effects) {
        try {
-               if (!transport.responseXML) return;
+               var reply = JSON.parse(transport.responseText);
+               if (!reply) return;
+
+               var seq = reply['seq'];
+
+               if (seq) {
+                       if (seq != _update_seq) {
+                               console.log("parse_headlines: wrong sequence received.");
+                               return;
+                       }
+               } else {
+                       return;
+               }
 
-               var headlines = transport.responseXML.getElementsByTagName('headlines')[0];
+               var headlines = reply['headlines']['content'];
+               var headlines_title = reply['headlines']['title'];
 
-               if (headlines) {
-                       headlines = eval("(" + headlines.firstChild.nodeValue + ")");
+               if (headlines && headlines_title) {
 
-                       if (replace) $('headlines-content').innerHTML = '';
+                       if (replace) {
+                               $('headlines-content').innerHTML = '';
+                       }
 
                        var pr = $('H-MORE-PROMPT');
 
                        if (pr) pr.parentNode.removeChild(pr);
 
+                       var inserted = false;
+
                        for (var i = 0; i < headlines.length; i++) {
-                               
+
                                if (!$('A-' + headlines[i].id)) {
-                                       add_headline_entry(headlines[i], 
-                                                       find_feed(last_feeds, headlines[i].feed_id));
+                                       add_headline_entry(headlines[i],
+                                                       find_feed(last_feeds, headlines[i].feed_id), !no_effects);
+
                                }
                        }
 
-                       if (pr) {
-                               $('headlines-content').appendChild(pr);
+                       console.log(inserted.id);
+
+                       var ids = get_visible_article_ids();
+
+                       if (ids.length > 0) {
+                               if (pr) {
+                                       $('headlines-content').appendChild(pr);
+
+                               } else {
+                                       $('headlines-content').innerHTML += "<li id='H-MORE-PROMPT'>" +
+                                               "<div class='body'>" +
+                                               "<a href=\"#\" onclick=\"catchup_visible_articles()\">" +
+                                               __("Mark as read") + "</a> | " +
+                                               "<a href=\"javascript:load_more()\">" +
+                                               __("Load more...") + "</a>" +
+                                               "<img style=\"display : none\" "+
+                                               "id=\"H-LOADING-IMG\" src='images/indicator_tiny.gif'>" +
+                                               "</div></li>";
+                               }
                        } else {
-                               $('headlines-content').innerHTML += "<li id='H-MORE-PROMPT'>" +
-                                       "<div class='body'><a href=\"javascript:load_more()\">" +
-                                       __("More articles...") + "</a></div></li>";
+                               // FIXME : display some kind of "nothing to see here" prompt here
                        }
 
-                       new Effect.Appear('headlines-content');
+//                     if (replace && !no_effects)
+//                             new Effect.Appear('headlines-content', {duration : 0.3});
+
+                       //new Effect.Appear('headlines-content');
                }
 
        } catch (e) {
@@ -399,97 +645,72 @@ function parse_headlines(transport, replace) {
        }
 }
 
-function init() {
+function init_second_stage() {
        try {
-               
                new Ajax.Request("backend.php", {
                        parameters: "backend.php?op=rpc&subop=digest-init",
                        onComplete: function(transport) {
                                parse_feeds(transport);
+                               Element.hide("overlay");
+
                                window.setTimeout('viewfeed(-4)', 100);
                                _update_timeout = window.setTimeout('update()', 5*1000);
                                } });
 
        } catch (e) {
-               exception_error("digest_init", e);
+               exception_error("init_second_stage", e);
        }
 }
 
-function tMark_afh_off(effect) {
-       try {
-               var elem = effect.effects[0].element;
-
-               console.log("tMark_afh_off : " + elem.id);
-
-               if (elem) {
-                       elem.src = elem.src.replace("mark_set", "mark_unset");
-                       elem.alt = __("Star article");
-                       Element.show(elem);
-               }
-
-       } catch (e) {
-               exception_error("tMark_afh_off", e);
-       }
-}
-
-function tPub_afh_off(effect) {
+function init() {
        try {
-               var elem = effect.effects[0].element;
-
-               console.log("tPub_afh_off : " + elem.id);
+               dojo.require("dijit.Dialog");
 
-               if (elem) {
-                       elem.src = elem.src.replace("pub_set", "pub_unset");
-                       elem.alt = __("Publish article");
-                       Element.show(elem);
-               }
+               new Ajax.Request("backend.php", {
+                       parameters: "?op=rpc&subop=sanityCheck",
+                       onComplete: function(transport) {
+                               backend_sanity_check_callback(transport);
+                       } });
 
        } catch (e) {
-               exception_error("tPub_afh_off", e);
+               exception_error("digest_init", e);
        }
 }
 
-function toggleMark(mark_img, id) {
+function toggle_mark(img, id) {
 
        try {
 
                var query = "?op=rpc&id=" + id + "&subop=mark";
-       
-               query = query + "&afid=" + _active_feed_id;
-               query = query + "&omode=c";
 
-               if (!mark_img) return;
+               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";
                } else {
-                       mark_img.alt = __("Please wait...");
+                       img.src = img.src.replace("mark_set", "mark_unset");
+                       img.alt = __("Star article");
                        query = query + "&mark=0";
-       
-                       mark_img.src = mark_img.src.replace("mark_set", "mark_unset");
-                       mark_img.alt = __("Star article");
                }
 
                new Ajax.Request("backend.php", {
                        parameters: query,
-                       onComplete: function(transport) { 
-                               //
+                       onComplete: function(transport) {
+                               update();
                        } });
 
        } catch (e) {
-               exception_error("toggleMark", e);
+               exception_error("toggle_mark", e);
        }
 }
 
-function togglePub(mark_img, id, note) {
+function toggle_pub(img, id, note) {
 
        try {
 
                var query = "?op=rpc&id=" + id + "&subop=publ";
-       
-               query = query + "&afid=" + _active_feed_id;
 
                if (note != undefined) {
                        query = query + "&note=" + param_escape(note);
@@ -497,48 +718,44 @@ function togglePub(mark_img, id, note) {
                        query = query + "&note=undefined";
                }
 
-               query = query + "&omode=c";
+               if (!img) return;
 
-               if (!mark_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";
-       
-                       mark_img.src = mark_img.src.replace("pub_set", "pub_unset");
-                       mark_img.alt = __("Publish article");
                }
 
                new Ajax.Request("backend.php", {
                        parameters: query,
-                       onComplete: function(transport) { 
-                               //
+                       onComplete: function(transport) {
+                               update();
                        } });
 
        } catch (e) {
-               exception_error("togglePub", e);
+               exception_error("toggle_pub", e);
        }
 }
 
 function fatal_error(code, msg) {
-       try {   
+       try {
 
                if (code == 6) {
                        window.location.href = "digest.php";
                } else if (code == 5) {
-                       window.location.href = "update.php";
+                       window.location.href = "db-updater.php";
                } else {
-       
+
                        if (msg == "") msg = "Unknown error";
 
-                       console.error("Fatal error: " + code + "\n" + 
+                       console.error("Fatal error: " + code + "\n" +
                                msg);
-                       
+
                }
 
        } catch (e) {
@@ -566,56 +783,59 @@ function fatal_error_check(transport) {
        return true;
 }
 
-function feed_mi(elem) {
+function update_title(unread) {
        try {
-               var imgs = elem.getElementsByTagName('IMG');
-               var spans = elem.getElementsByTagName('SPAN');
-
-               for (var i = 0; i < imgs.length; i++) {
-                       if (imgs[i].className == "dismiss")
-                               Element.show(imgs[i]);
-               }
-
-               for (var i = 0; i < spans.length; i++) {
-                       if (spans[i].className == "unread")
-                               Element.hide(spans[i]);
-               }
+               document.title = "Tiny Tiny RSS";
 
+               if (unread > 0)
+                       document.title += " (" + unread + ")";
 
        } catch (e) {
-               exception_error("feed_mi", e);
+               exception_error("update_title", e);
        }
 }
 
-function feed_mo(elem) {
+function tweet_article(id) {
        try {
-               var imgs = elem.getElementsByTagName('IMG');
-               var spans = elem.getElementsByTagName('SPAN');
 
-               for (var i = 0; i < imgs.length; i++) {
-                       if (imgs[i].className == "dismiss")
-                               Element.hide(imgs[i]);
-               }
+               var query = "?op=rpc&subop=getTweetInfo&id=" + param_escape(id);
 
-               for (var i = 0; i < spans.length; i++) {
-                       if (spans[i].className == "unread")
-                               Element.show(spans[i]);
-               }
+               console.log(query);
+
+               var d = new Date();
+      var ts = d.getTime();
+
+               var w = window.open('backend.php?op=loading', 'ttrss_tweet',
+                       "status=0,toolbar=0,location=0,width=500,height=400,scrollbars=1,menubar=0");
+
+               new Ajax.Request("backend.php", {
+                       parameters: query,
+                       onComplete: function(transport) {
+                               var ti = JSON.parse(transport.responseText);
+
+                               var share_url = "http://twitter.com/share?_=" + ts +
+                                       "&text=" + param_escape(ti.title) +
+                                       "&url=" + param_escape(ti.link);
+
+                               w.location.href = share_url;
+
+                       } });
 
        } catch (e) {
-               exception_error("feed_mo", e);
+               exception_error("tweet_article", e);
        }
 }
 
-function update_title(unread) {
+function toggle_select_article(elem) {
        try {
-               document.title = "Tiny Tiny RSS";
+               var article = elem.parentNode;
 
-               if (unread > 0)
-                       document.title += " (" + unread + ")";
+               if (article.hasClassName("selected"))
+                       article.removeClassName("selected");
+               else
+                       article.addClassName("selected");
 
        } catch (e) {
-               exception_error("update_title", e);
+               exception_error("toggle_select_article", e);
        }
 }
-