]> git.wh0rd.org - tt-rss.git/blobdiff - js/viewfeed.js
(experimental) disable infscroll requests while marking auto catched up articles...
[tt-rss.git] / js / viewfeed.js
index 14c9217c12f3d9431f68f39063b62a028c327e18..e1425a3820fd056e0e8f834d78ace9a74015617d 100644 (file)
@@ -13,6 +13,7 @@ var catchup_timeout_id = false;
 var cids_requested = [];
 var loaded_article_ids = [];
 var _last_headlines_update = 0;
+var current_first_id = 0;
 
 var has_storage = 'sessionStorage' in window && window['sessionStorage'] !== null;
 
@@ -45,7 +46,7 @@ function headlines_callback2(transport, offset, background, infscroll_req) {
                                return;
                        }
 
-                       if (feed_id != getActiveFeedId() || is_cat != activeFeedIsCat())
+                       if (feed_id != -7 && (feed_id != getActiveFeedId() || is_cat != activeFeedIsCat()))
                                return;
 
                        /* dijit.getEnclosingWidget(
@@ -56,7 +57,7 @@ function headlines_callback2(transport, offset, background, infscroll_req) {
                                if (infscroll_req == false) {
                                        $("headlines-frame").scrollTop = 0;
 
-                                       Element.hide("floatingTitle");
+                                       $("floatingTitle").style.visibility = "hidden";
                                        $("floatingTitle").setAttribute("rowid", 0);
                                        $("floatingTitle").innerHTML = "";
                                }
@@ -77,6 +78,7 @@ function headlines_callback2(transport, offset, background, infscroll_req) {
                                _infscroll_disable = 0;
                        }
 
+                       current_first_id = reply['headlines']['first_id'];
                        var counters = reply['counters'];
                        var articles = reply['articles'];
                        //var runtime_info = reply['runtime-info'];
@@ -84,22 +86,16 @@ function headlines_callback2(transport, offset, background, infscroll_req) {
                        if (infscroll_req == false) {
                                loaded_article_ids = [];
 
-                               dijit.byId("headlines-frame").attr('content',
-                                       reply['headlines']['content']);
-
-                               //dijit.byId("headlines-toolbar").attr('content',
-                               //      reply['headlines']['toolbar']);
-
                                dojo.html.set($("headlines-toolbar"),
                                                reply['headlines']['toolbar'],
                                                {parseContent: true});
 
-                               $$("#headlines-frame > div[id*=RROW]").each(function(row) {
-                                       if (loaded_article_ids.indexOf(row.id) != -1) {
-                                               row.parentNode.removeChild(row);
-                                       } else {
-                                               loaded_article_ids.push(row.id);
-                                       }
+                               dojo.html.set($("headlines-frame"),
+                                       reply['headlines']['content'],
+                                       {parseContent: true});
+
+                               $$("#headlines-frame div[id*='RROW']").each(function(row) {
+                                       loaded_article_ids.push(row.id);
                                });
 
                                var hsp = $("headlines-spacer");
@@ -125,40 +121,31 @@ function headlines_callback2(transport, offset, background, infscroll_req) {
 
                                        var c = dijit.byId("headlines-frame");
                                        var ids = getSelectedArticleIds2();
-                                       var new_elems = [];
-
-                                       $("headlines-tmp").innerHTML = reply['headlines']['content'];
 
                                        var hsp = $("headlines-spacer");
 
                                        if (hsp)
                                                c.domNode.removeChild(hsp);
 
-                                       $$("#headlines-tmp > div").each(function(row) {
-                                               if (row.className == 'cdmFeedTitle') {
-                                                       row.style.display = 'none';
-                                                       c.domNode.appendChild(row);
-                                                       new_elems.push(row);
-                                               } else if (loaded_article_ids.indexOf(row.id) == -1) {
-                                                       row.style.display = 'none';
-                                                       c.domNode.appendChild(row);
-                                                       new_elems.push(row);
+                                       var tmp = new Element("div");
+                                       tmp.innerHTML = reply['headlines']['content'];
+                                       dojo.parser.parse(tmp);
+
+                                       while (tmp.hasChildNodes()) {
+                                               var row = tmp.removeChild(tmp.firstChild);
+
+                                               if (loaded_article_ids.indexOf(row.id) == -1 || row.hasClassName("cdmFeedTitle")) {
+                                                       dijit.byId("headlines-frame").domNode.appendChild(row);
+                                                       Element.hide(row);
+                                                       new Effect.Appear(row, {duration:0.5});
                                                        loaded_article_ids.push(row.id);
-                                               } else {
-                                                       row.parentNode.removeChild(row);
                                                }
-                                       });
+                                       }
 
                                        if (!hsp) hsp = new Element("DIV", {"id": "headlines-spacer"});
+                                       c.domNode.appendChild(hsp);
 
-//                                     if (getInitParam("cdm_auto_catchup") == 1) {
-                                               c.domNode.appendChild(hsp);
-//                                     }
-
-                                       console.log("added " + new_elems.size() + " headlines");
-
-                                       if (new_elems.size() == 0)
-                                               _infscroll_disable = true;
+                                       if (headlines_count < 30) _infscroll_disable = true;
 
                                        console.log("restore selected ids: " + ids);
 
@@ -168,19 +155,30 @@ function headlines_callback2(transport, offset, background, infscroll_req) {
 
                                        initHeadlinesMenu();
 
-                                       new_elems.each(function(child) {
-                                               dojo.parser.parse(child);
-
-                                               if (!Element.visible(child))
-                                                       new Effect.Appear(child, { duration : 0.5 });
-                                       });
+                                       if (_infscroll_disable) {
+                                               hsp.innerHTML = "<a href='#' onclick='openNextUnreadFeed()'>" +
+                                               __("Click to open next unread feed.") + "</a>";
+                                       }
 
                                } else {
                                        console.log("no new headlines received");
 
+                                       var first_id_changed = reply['headlines']['first_id_changed'];
+                                       console.log("first id changed:" + first_id_changed);
+
                                        var hsp = $("headlines-spacer");
 
-                                       if (hsp) hsp.innerHTML = "Click to open next unread feed.";
+                                       if (hsp) {
+                                               if (first_id_changed) {
+                                                       hsp.innerHTML = "<a href='#' onclick='viewCurrentFeed()'>" +
+                                                       __("New articles found, reload feed to continue.") + "</a>";
+                                               } else {
+                                                       hsp.innerHTML = "<a href='#' onclick='openNextUnreadFeed()'>" +
+                                                       __("Click to open next unread feed.") + "</a>";
+                                               }
+
+                                       }
+
                                }
                        }
 
@@ -329,18 +327,6 @@ function article_callback2(transport, id) {
                var unread_in_buffer = $$("#headlines-frame > div[id*=RROW][class*=Unread]").length
                request_counters(unread_in_buffer == 0);
 
-               //headlines_scroll_handler($("headlines-frame"));
-
-/*             try {
-                       if (!_infscroll_disable &&
-                                       $$("#headlines-frame > div[id*=RROW]").last().hasClassName("Selected")) {
-
-                               loadMoreHeadlines();
-                       }
-               } catch (e) {
-                       console.warn(e);
-               } */
-
                notify("");
        } catch (e) {
                exception_error("article_callback2", e, transport);
@@ -406,19 +392,6 @@ function view(id, activefeed, noexpand) {
                        // if we don't need to request any relative ids, we might as well skip
                        // the server roundtrip altogether
                        if (cids_to_request.length == 0) {
-
-/*                             try {
-                                       if (!_infscroll_disable &&
-                                               $$("#headlines-frame > div[id*=RROW]").last().hasClassName("Selected")) {
-
-                                                       loadMoreHeadlines();
-                                       }
-                               } catch (e) {
-                                       console.warn(e);
-                               } */
-
-                               //headlines_scroll_handler($("headlines-frame"));
-
                                return;
                        }
                }
@@ -1195,7 +1168,7 @@ function editArticleTags(id) {
                                        }});
                                }
                        },
-                       href: query,
+                       href: query
                });
 
                var tmph = dojo.connect(dialog, 'onLoad', function() {
@@ -1311,20 +1284,21 @@ function headlines_scroll_handler(e) {
                                                ((e.scrollTop + e.offsetHeight) / e.scrollHeight >= 0.7))) {
 
                                if (hsp)
-                                       hsp.innerHTML = "<img src='images/indicator_tiny.gif'> " +
-                                               __("Loading, please wait...");
+                                       hsp.innerHTML = "<span class='loading'><img src='images/indicator_tiny.gif'> " +
+                                               __("Loading, please wait...") + "</span>";
 
                                loadMoreHeadlines();
                                return;
 
                        }
-               } else {
-                       if (hsp)
+               /*} else {
+                       if (hsp) {
                                if (_infscroll_disable)
                                        hsp.innerHTML = "<a href='#' onclick='openNextUnreadFeed()'>" +
                                                __("Click to open next unread feed.") + "</a>";
                                else
                                        hsp.innerHTML = "";
+                       }*/
                }
 
                if (isCdmMode()) {
@@ -1410,6 +1384,8 @@ function catchupBatchedArticles() {
                                        reply = JSON.parse(transport.responseText);
                                        var batch = reply.ids;
 
+                                       _infscroll_tmp_disable = 1;
+
                                        batch.each(function(id) {
                                                console.log(id);
                                                var elem = $("RROW-" + id);
@@ -1417,6 +1393,8 @@ function catchupBatchedArticles() {
                                                catchup_id_batch.remove(id);
                                        });
 
+                                       _infscroll_tmp_disable = 0;
+
                                        updateFloatingTitle(true);
 
                                } });
@@ -1531,7 +1509,7 @@ function cdmCollapseArticle(event, id, unmark) {
                        if (row.offsetTop < $("headlines-frame").scrollTop)
                                scrollToRowId(row.id);
 
-                       Element.hide("floatingTitle");
+                       $("floatingTitle").style.visibility = "hidden";
                        $("floatingTitle").setAttribute("rowid", false);
                }
 
@@ -2087,12 +2065,12 @@ function headlinesMenuCommon(menu, base_id) {
 
                        menu.addChild(new dijit.PopupMenuItem({
                                label: __("Assign label"),
-                               popup: labelAddMenu,
+                               popup: labelAddMenu
                        }));
 
                        menu.addChild(new dijit.PopupMenuItem({
                                label: __("Remove label"),
-                               popup: labelDelMenu,
+                               popup: labelDelMenu
                        }));
 
                }
@@ -2122,7 +2100,7 @@ function initHeadlinesMenu() {
 
                var menu = new dijit.Menu({
                        id: "headlinesMenu",
-                       targetNodeIds: ids,
+                       targetNodeIds: ids
                });
 
                var tmph = dojo.connect(menu, '_openMyself', function (event) {
@@ -2157,7 +2135,7 @@ function initHeadlinesMenu() {
 
                        var menu = new dijit.Menu({
                                id: "headlinesFeedTitleMenu",
-                               targetNodeIds: ids,
+                               targetNodeIds: ids
                        });
 
                        var tmph = dojo.connect(menu, '_openMyself', function (event) {
@@ -2292,6 +2270,34 @@ function setSelectionScore() {
        }
 }
 
+function updateScore(id) {
+       try {
+               var pic = $$("#RROW-" + id + " .hlScorePic")[0];
+
+               if (pic) {
+
+                       var query = "op=article&method=getScore&id=" + param_escape(id);
+
+                       new Ajax.Request("backend.php", {
+                               parameters: query,
+                               onComplete: function(transport) {
+                                       console.log(transport.responseText);
+
+                                       var reply = JSON.parse(transport.responseText);
+
+                                       if (reply) {
+                                               pic.src = pic.src.replace(/score_.*?\.png/, reply["score_pic"]);
+                                               pic.setAttribute("score", reply["score"]);
+                                               pic.setAttribute("title", reply["score"]);
+                                       }
+                               } });
+               }
+
+       } catch (e) {
+               exception_error("updateScore", e);
+       }
+}
+
 function changeScore(id, pic) {
        try {
                var score = pic.getAttribute("score");
@@ -2311,6 +2317,7 @@ function changeScore(id, pic) {
                                        if (reply) {
                                                pic.src = pic.src.replace(/score_.*?\.png/, reply["score_pic"]);
                                                pic.setAttribute("score", new_score);
+                                               pic.setAttribute("title", new_score);
                                        }
                                } });
                }
@@ -2356,7 +2363,7 @@ function scrollToRowId(id) {
                var row = $(id);
 
                if (row)
-                       $("headlines-frame").scrollTop = row.offsetTop;
+                       $("headlines-frame").scrollTop = row.offsetTop - 4;
 
        } catch (e) {
                exception_error("scrollToRowId", e);
@@ -2401,11 +2408,12 @@ function updateFloatingTitle(unread_only) {
                                        PluginHost.run(PluginHost.HOOK_FLOATING_TITLE, child);
                                }
 
-                               if (child.offsetTop < hf.scrollTop - header.offsetHeight &&
-                                               child.offsetTop + child.offsetHeight - hf.scrollTop > header.offsetHeight)
-                                       Element.show("floatingTitle");
+                               $("floatingTitle").style.marginRight = hf.offsetWidth - child.offsetWidth + "px";
+                               if (header.offsetTop + header.offsetHeight < hf.scrollTop + $("floatingTitle").offsetHeight - 5 &&
+                                   child.offsetTop + child.offsetHeight >= hf.scrollTop + $("floatingTitle").offsetHeight - 5)
+                                       $("floatingTitle").style.visibility = "visible";
                                else
-                                       Element.hide("floatingTitle");
+                                       $("floatingTitle").style.visibility = "hidden";
 
                                return;
 
@@ -2416,3 +2424,7 @@ function updateFloatingTitle(unread_only) {
                exception_error("updateFloatingTitle", e);
        }
 }
+
+function cdmFooterClick(event) {
+       event.stopPropagation();
+}
\ No newline at end of file