]> git.wh0rd.org - tt-rss.git/blobdiff - js/viewfeed.js
remove cdmUnexpandArticle
[tt-rss.git] / js / viewfeed.js
index db1a4bf94c982bba1c9eb1b8f2a93853876c6db3..ada225cbff79db627d9d0d64a7c2b33de4f5680b 100644 (file)
@@ -43,9 +43,7 @@ function headlines_callback2(transport, offset, background, infscroll_req) {
                        if (background) {
                                var content = reply['headlines']['content'];
 
-                               if (getInitParam("cdm_auto_catchup") == 1) {
-                                       content = content + "<div id='headlines-spacer'></div>";
-                               }
+                               content = content + "<div id='headlines-spacer'></div>";
                                return;
                        }
 
@@ -93,11 +91,9 @@ function headlines_callback2(transport, offset, background, infscroll_req) {
                                        }
                                });
 
-                               if (getInitParam("cdm_auto_catchup") == 1) {
-                                       var hsp = $("headlines-spacer");
-                                       if (!hsp) hsp = new Element("DIV", {"id": "headlines-spacer"});
-                                       dijit.byId('headlines-frame').domNode.appendChild(hsp);
-                               }
+                               var hsp = $("headlines-spacer");
+                               if (!hsp) hsp = new Element("DIV", {"id": "headlines-spacer"});
+                               dijit.byId('headlines-frame').domNode.appendChild(hsp);
 
                                initHeadlinesMenu();
 
@@ -160,16 +156,10 @@ function headlines_callback2(transport, offset, background, infscroll_req) {
                                        initHeadlinesMenu();
 
                                        new_elems.each(function(child) {
-                                               var cb = dijit.byId(child.id.replace("RROW-", "RCHK-"));
-
-                                               if (!cb) {
-                                                       dojo.parser.parse(child);
+                                               dojo.parser.parse(child);
 
-                                                       if (!Element.visible(child))
-                                                               new Effect.Appear(child, { duration : 0.5 });
-                                               } else {
-                                                       c.domNode.removeChild(child);
-                                               }
+                                               if (!Element.visible(child))
+                                                       new Effect.Appear(child, { duration : 0.5 });
                                        });
 
                                } else {
@@ -210,6 +200,16 @@ function headlines_callback2(transport, offset, background, infscroll_req) {
 
                unpackVisibleHeadlines();
 
+               // if we have some more space in the buffer, why not try to fill it
+
+               if (!_infscroll_disable && $("headlines-spacer") &&
+                               $("headlines-spacer").offsetTop < $("headlines-frame").offsetHeight) {
+
+                       window.setTimeout(function() {
+                               loadMoreHeadlines();
+                       }, 250);
+               }
+
                notify("");
 
        } catch (e) {
@@ -228,6 +228,8 @@ function render_article(article) {
                        c.domNode.scrollTop = 0;
                } catch (e) { };
 
+               PluginHost.run(PluginHost.HOOK_ARTICLE_RENDERED, article);
+
                c.attr('content', article);
 
                correctHeadlinesOffset(getActiveArticleId());
@@ -438,21 +440,27 @@ function toggleMark(id, client_only) {
        try {
                var query = "?op=rpc&id=" + id + "&method=mark";
 
-               var img = $("FMPIC-" + id);
+               var row = $("RROW-" + id);
+               if (!row) return;
 
-               if (!img) return;
+               var imgs = row.getElementsByClassName("markedPic");
 
-               if (img.src.match("mark_unset")) {
-                       img.src = img.src.replace("mark_unset", "mark_set");
-                       img.alt = __("Unstar article");
-                       query = query + "&mark=1";
+               for (i = 0; i < imgs.length; i++) {
+                       var img = imgs[i];
 
-               } else {
-                       img.src = img.src.replace("mark_set", "mark_unset");
-                       img.alt = __("Star article");
-                       query = query + "&mark=0";
+                       if (!row.hasClassName("marked")) {
+                               img.src = img.src.replace("mark_unset", "mark_set");
+                               img.alt = __("Unstar article");
+                               query = query + "&mark=1";
+                       } else {
+                               img.src = img.src.replace("mark_set", "mark_unset");
+                               img.alt = __("Star article");
+                               query = query + "&mark=0";
+                       }
                }
 
+               row.toggleClassName("marked");
+
                if (!client_only) {
                        new Ajax.Request("backend.php", {
                                parameters: query,
@@ -476,22 +484,30 @@ function togglePub(id, client_only, no_effects, note) {
                        query = query + "&note=undefined";
                }
 
-               var img = $("FPPIC-" + id);
-
-               if (!img) return;
+               var row = $("RROW-" + id);
+               if (!row) return;
 
-               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";
+               var imgs = row.getElementsByClassName("pubPic");
 
-               } else {
-                       img.src = img.src.replace("pub_set", "pub_unset");
-                       img.alt = __("Publish article");
+               for (i = 0; i < imgs.length; i++) {
+                       var img = imgs[i];
 
-                       query = query + "&pub=0";
+                       if (!row.hasClassName("published") || note != undefined) {
+                               img.src = img.src.replace("pub_unset", "pub_set");
+                               img.alt = __("Unpublish article");
+                               query = query + "&pub=1";
+                       } else {
+                               img.src = img.src.replace("pub_set", "pub_unset");
+                               img.alt = __("Publish article");
+                               query = query + "&pub=0";
+                       }
                }
 
+               if (note != undefined)
+                       row.addClassName("published");
+               else
+                       row.toggleClassName("published");
+
                if (!client_only) {
                        new Ajax.Request("backend.php", {
                                parameters: query,
@@ -607,11 +623,12 @@ function moveToPost(mode, noscroll, noexpand) {
 
 function toggleSelected(id, force_on) {
        try {
-
-               var cb = dijit.byId("RCHK-" + id);
                var row = $("RROW-" + id);
 
                if (row) {
+                       var cb = dijit.getEnclosingWidget(
+                                       row.getElementsByClassName("rchk")[0]);
+
                        if (row.hasClassName('Selected') && !force_on) {
                                row.removeClassName('Selected');
                                if (cb) cb.attr("checked", false);
@@ -620,11 +637,33 @@ function toggleSelected(id, force_on) {
                                if (cb) cb.attr("checked", true);
                        }
                }
+
+               updateSelectedPrompt();
        } catch (e) {
                exception_error("toggleSelected", e);
        }
 }
 
+function updateSelectedPrompt() {
+       try {
+               var count = getSelectedArticleIds2().size();
+               var elem = $("selected_prompt");
+
+               if (elem) {
+                       elem.innerHTML = ngettext("%d article selected",
+                                       "%d articles selected", count).replace("%d", count);
+
+                       if (count > 0)
+                               Element.show(elem);
+                       else
+                               Element.hide(elem);
+               }
+
+       } catch (e) {
+               exception_error("updateSelectedPrompt", e);
+       }
+}
+
 function toggleUnread_afh(effect) {
        try {
 
@@ -894,7 +933,9 @@ function selectArticles(mode) {
 
                children.each(function(child) {
                        var id = child.id.replace("RROW-", "");
-                       var cb = dijit.byId("RCHK-" + id);
+
+                       var cb = dijit.getEnclosingWidget(
+                                       child.getElementsByClassName("rchk")[0]);
 
                        if (mode == "all") {
                                child.addClassName("Selected");
@@ -908,9 +949,7 @@ function selectArticles(mode) {
                                        if (cb) cb.attr("checked", false);
                                }
                        } else if (mode == "marked") {
-                               var img = $("FMPIC-" + child.id.replace("RROW-", ""));
-
-                               if (img && img.src.match("mark_set")) {
+                               if (child.hasClassName("marked")) {
                                        child.addClassName("Selected");
                                        if (cb) cb.attr("checked", true);
                                } else {
@@ -918,9 +957,7 @@ function selectArticles(mode) {
                                        if (cb) cb.attr("checked", false);
                                }
                        } else if (mode == "published") {
-                               var img = $("FPPIC-" + child.id.replace("RROW-", ""));
-
-                               if (img && img.src.match("pub_set")) {
+                               if (child.hasClassName("published")) {
                                        child.addClassName("Selected");
                                        if (cb) cb.attr("checked", true);
                                } else {
@@ -943,6 +980,8 @@ function selectArticles(mode) {
                        }
                });
 
+               updateSelectedPrompt();
+
        } catch (e) {
                exception_error("selectArticles", e);
        }
@@ -1152,6 +1191,7 @@ function cdmScrollToArticleId(id, force) {
 
 function setActiveArticleId(id) {
        _active_article_id = id;
+       PluginHost.run(PluginHost.HOOK_ARTICLE_SET_ACTIVE, _active_article_id);
 }
 
 function getActiveArticleId() {
@@ -1178,6 +1218,8 @@ function unpackVisibleHeadlines() {
                                        var cencw = $("CENCW-" + child.id.replace("RROW-", ""));
 
                                        if (cencw) {
+                                               PluginHost.run(PluginHost.HOOK_ARTICLE_RENDERED_CDM, child);
+
                                                cencw.innerHTML = htmlspecialchars_decode(cencw.innerHTML);
                                                cencw.setAttribute('id', '');
                                                Element.show(cencw);
@@ -1353,8 +1395,10 @@ function catchupRelativeToArticle(below, id) {
        }
 }
 
-function cdmCollapseArticle(event, id) {
+function cdmCollapseArticle(event, id, unmark) {
        try {
+               if (unmark == undefined) unmark = true;
+
                var row = $("RROW-" + id);
                var elem = $("CICD-" + id);
 
@@ -1365,40 +1409,24 @@ function cdmCollapseArticle(event, id) {
                        Element.hide(elem);
                        Element.show("CEXC-" + id);
                        Element.hide(collapse);
-                       row.removeClassName("active");
 
-                       markHeadline(id, false);
+                       if (unmark) {
+                               row.removeClassName("active");
+
+                               markHeadline(id, false);
 
-                       if (id == getActiveArticleId()) {
-                               setActiveArticleId(0);
+                               if (id == getActiveArticleId()) {
+                                       setActiveArticleId(0);
+                               }
                        }
 
                        if (event) Event.stop(event);
-               }
-
-       } catch (e) {
-               exception_error("cdmCollapseArticle", e);
-       }
-}
-
-function cdmUnexpandArticle(event, id) {
-       try {
-               var row = $("RROW-" + id);
-               var elem = $("CICD-" + id);
-
-               if (elem && row) {
-                       var collapse = $$("div#RROW-" + id +
-                               " span[class='collapseBtn']")[0];
-
-                       Element.hide(elem);
-                       Element.show("CEXC-" + id);
-                       Element.hide(collapse);
 
-                       if (event) Event.stop(event);
+                       PluginHost.run(PluginHost.HOOK_ARTICLE_COLLAPSED, id);
                }
 
        } catch (e) {
-               exception_error("cdmUnexpandArticle", e);
+               exception_error("cdmCollapseArticle", e);
        }
 }
 
@@ -1461,6 +1489,8 @@ function cdmExpandArticle(id, noexpand) {
                toggleSelected(id);
                $("RROW-" + id).addClassName("active");
 
+               PluginHost.run(PluginHost.HOOK_ARTICLE_EXPANDED, id);
+
        } catch (e) {
                exception_error("cdmExpandArticle", e);
        }
@@ -1729,7 +1759,8 @@ function markHeadline(id, marked) {
 
        var row = $("RROW-" + id);
        if (row) {
-               var check = dijit.byId("RCHK-" + id);
+               var check = dijit.getEnclosingWidget(
+                               row.getElementsByClassName("rchk")[0]);
 
                if (check) {
                        check.attr("checked", marked);
@@ -1985,34 +2016,6 @@ function initHeadlinesMenu() {
        }
 }
 
-
-function player(elem) {
-       var aid = elem.getAttribute("audio-id");
-       var status = elem.getAttribute("status");
-
-       var audio = $(aid);
-
-       if (audio) {
-               if (status == 0) {
-                       audio.play();
-                       status = 1;
-                       elem.innerHTML = __("Playing...");
-                       elem.title = __("Click to pause");
-                       elem.addClassName("playing");
-               } else {
-                       audio.pause();
-                       status = 0;
-                       elem.innerHTML = __("Play");
-                       elem.title = __("Click to play");
-                       elem.removeClassName("playing");
-               }
-
-               elem.setAttribute("status", status);
-       } else {
-               alert("Your browser doesn't seem to support HTML5 audio.");
-       }
-}
-
 function cache_set(id, obj) {
        //console.log("cache_set: " + id);
        if (has_storage)