add net-alert icon

[tt-rss.git] / js / viewfeed.js

diff --git a/js/viewfeed.js b/js/viewfeed.js
index c0cc416b6587ecd0929b3c60d687ee3144b21fca..d6801a186a1e8a201e63a91397d26d9a785b7311 100644 (file)
--- a/js/viewfeed.js
+++ b/js/viewfeed.js
@@ -162,8 +162,16 @@ function headlines_callback2(transport, offset, background, infscroll_req) {
                                        initHeadlinesMenu();
 
                                        new_elems.each(function(child) {
-                                               if (!Element.visible(child))
-                                                       new Effect.Appear(child, { duration : 0.5 });
+                                               var cb = dijit.byId(child.id.replace("RROW-", "RCHK-"));
+
+                                               if (!cb) {
+                                                       dojo.parser.parse(child);
+
+                                                       if (!Element.visible(child))
+                                                               new Effect.Appear(child, { duration : 0.5 });
+                                               } else {
+                                                       c.domNode.removeChild(child);
+                                               }
                                        });
 
                                } else {
@@ -196,11 +204,14 @@ function headlines_callback2(transport, offset, background, infscroll_req) {
                        else
                                request_counters();
 
-               } else {
+               } else if (transport.responseText) {
                        console.error("Invalid object received: " + transport.responseText);
                        dijit.byId("headlines-frame").attr('content', "<div class='whiteBox'>" +
                                        __('Could not update headlines (invalid object received - see error console for details)') +
                                        "</div>");
+               } else {
+                       //notify_error("Error communicating with server.");
+                       Element.show("net-alert");
                }
 
                _infscroll_request_sent = 0;
@@ -252,8 +263,6 @@ function showArticleInHeadlines(id) {
 
                selectArticles('none');
 
-               var upd_img_pic = $("FUPDPIC-" + id);
-
                var view_mode = false;
 
                try {
@@ -263,14 +272,7 @@ function showArticleInHeadlines(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";
-
-                       cache_headlines(getActiveFeedId(), activeFeedIsCat(), null, $("headlines-frame").innerHTML);
-
-               } else if (article_is_unread && view_mode == "all_articles") {
+               if (article_is_unread && view_mode == "all_articles") {
                        cache_headlines(getActiveFeedId(), activeFeedIsCat(), null, $("headlines-frame").innerHTML);
                }
 
@@ -300,10 +302,6 @@ function article_callback2(transport, id) {
 
                if (reply) {
 
-                       var upic = $('FUPDPIC-' + id);
-
-                       if (upic) upic.src = 'images/blank_icon.gif';
-
                        reply.each(function(article) {
                                if (active_post_id == article['id']) {
                                        render_article(article['content']);
@@ -318,11 +316,13 @@ function article_callback2(transport, id) {
 //                             return;
 //                     }
 
-               } else {
+               } else if (transport.responseText) {
                        console.error("Invalid object received: " + transport.responseText);
 
                        render_article("<div class='whiteBox'>" +
                                        __('Could not display article (invalid object received - see error console for details)') + "</div>");
+               } else {
+                       Element.show("net-alert");
                }
 
                request_counters();
@@ -383,15 +383,7 @@ function view(id) {
 
                precache_headlines();
 
-               if (!cached_article) {
-
-                       var upic = $('FUPDPIC-' + id);
-
-                       if (upic) {
-                               upic.src = getInitParam("sign_progress");
-                       }
-
-               } else if (cached_article && article_is_unread) {
+               if (cached_article && article_is_unread) {
 
                        query = query + "&mode=prefetch";
 
@@ -586,16 +578,16 @@ function moveToPost(mode) {
 function toggleSelected(id, force_on) {
        try {
 
-               var cb = $("RCHK-" + id);
+               var cb = dijit.byId("RCHK-" + id);
                var row = $("RROW-" + id);
 
                if (row) {
                        if (row.hasClassName('Selected') && !force_on) {
                                row.removeClassName('Selected');
-                               if (cb) cb.checked = false;
+                               if (cb) cb.attr("checked", false);
                        } else {
                                row.addClassName('Selected');
-                               if (cb) cb.checked = true;
+                               if (cb) cb.attr("checked", true);
                        }
                }
        } catch (e) {
@@ -881,52 +873,52 @@ function selectArticles(mode) {
 
                children.each(function(child) {
                        var id = child.id.replace("RROW-", "");
-                       var cb = $("RCHK-" + id);
+                       var cb = dijit.byId("RCHK-" + id);
 
                        if (mode == "all") {
                                child.addClassName("Selected");
-                               cb.checked = true;
+                               if (cb) cb.attr("checked", true);
                        } else if (mode == "unread") {
                                if (child.hasClassName("Unread")) {
                                        child.addClassName("Selected");
-                                       cb.checked = true;
+                                       if (cb) cb.attr("checked", true);
                                } else {
                                        child.removeClassName("Selected");
-                                       cb.checked = false;
+                                       if (cb) cb.attr("checked", false);
                                }
                        } else if (mode == "marked") {
                                var img = $("FMPIC-" + child.id.replace("RROW-", ""));
 
                                if (img && img.src.match("mark_set")) {
                                        child.addClassName("Selected");
-                                       cb.checked = true;
+                                       if (cb) cb.attr("checked", true);
                                } else {
                                        child.removeClassName("Selected");
-                                       cb.checked = false;
+                                       if (cb) cb.attr("checked", false);
                                }
                        } else if (mode == "published") {
                                var img = $("FPPIC-" + child.id.replace("RROW-", ""));
 
                                if (img && img.src.match("pub_set")) {
                                        child.addClassName("Selected");
-                                       cb.checked = true;
+                                       if (cb) cb.attr("checked", true);
                                } else {
                                        child.removeClassName("Selected");
-                                       cb.checked = false;
+                                       if (cb) cb.attr("checked", false);
                                }
 
                        } else if (mode == "invert") {
                                if (child.hasClassName("Selected")) {
                                        child.removeClassName("Selected");
-                                       cb.checked = false;
+                                       if (cb) cb.attr("checked", false);
                                } else {
                                        child.addClassName("Selected");
-                                       cb.checked = true;
+                                       if (cb) cb.attr("checked", true);
                                }
 
                        } else {
                                child.removeClassName("Selected");
-                               cb.checked = false;
+                               if (cb) cb.attr("checked", false);
                        }
                });
 
@@ -1314,14 +1306,6 @@ function cdmExpandArticle(id) {
 
                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;
 
@@ -1634,14 +1618,6 @@ function cdmClicked(event, id) {
                                if (elem)
                                        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;
 
                                if (article_is_unread) {
@@ -1751,10 +1727,10 @@ function isCdmMode() {
 function markHeadline(id) {
        var row = $("RROW-" + id);
        if (row) {
-               var check = $("RCHK-" + id);
+               var check = dijit.byId("RCHK-" + id);
 
                if (check) {
-                       check.checked = true;
+                       check.attr("checked", true);
                }
 
                row.addClassName("Selected");