]> git.wh0rd.org - tt-rss.git/blobdiff - js/viewfeed.js
Merge pull request #134 from sunjayc99/master
[tt-rss.git] / js / viewfeed.js
index 664eba39346b21e82f723830a31330fc5f964848..db1a4bf94c982bba1c9eb1b8f2a93853876c6db3 100644 (file)
@@ -12,8 +12,7 @@ var catchup_timeout_id = false;
 
 var cids_requested = [];
 var loaded_article_ids = [];
-
-var _post_preview_timeout = false;
+var _last_headlines_update = 0;
 
 var has_storage = 'sessionStorage' in window && window['sessionStorage'] !== null;
 
@@ -50,11 +49,12 @@ function headlines_callback2(transport, offset, background, infscroll_req) {
                                return;
                        }
 
-                       setActiveFeedId(feed_id, is_cat);
+                       if (feed_id != getActiveFeedId() || is_cat != activeFeedIsCat())
+                               return;
 
-                       dijit.getEnclosingWidget(
+                       /* dijit.getEnclosingWidget(
                                document.forms["main_toolbar_form"].update).attr('disabled',
-                                       is_cat || feed_id <= 0);
+                                       is_cat || feed_id <= 0); */
 
                        try {
                                if (infscroll_req == false) {
@@ -66,7 +66,7 @@ function headlines_callback2(transport, offset, background, infscroll_req) {
 
                        vgroup_last_feed = reply['headlines-info']['vgroup_last_feed'];
 
-                       if (parseInt(headlines_count) < getInitParam("default_article_limit")) {
+                       if (parseInt(headlines_count) < 30) {
                                _infscroll_disable = 1;
                        } else {
                                _infscroll_disable = 0;
@@ -206,6 +206,7 @@ function headlines_callback2(transport, offset, background, infscroll_req) {
                }
 
                _infscroll_request_sent = 0;
+               _last_headlines_update = new Date().getTime();
 
                unpackVisibleHeadlines();
 
@@ -240,7 +241,7 @@ function render_article(article) {
        }
 }
 
-function showArticleInHeadlines(id) {
+function showArticleInHeadlines(id, noexpand) {
 
        try {
                selectArticles("none");
@@ -251,7 +252,8 @@ function showArticleInHeadlines(id) {
 
                var article_is_unread = crow.hasClassName("Unread");
 
-               crow.removeClassName("Unread");
+               if (!noexpand)
+                       crow.removeClassName("Unread");
                crow.addClassName("active");
 
                selectArticles('none');
@@ -267,7 +269,7 @@ function showArticleInHeadlines(id) {
 
                markHeadline(id);
 
-               if (article_is_unread)
+               if (article_is_unread && !noexpand)
                        _force_scheduled_update = true;
 
        } catch (e) {
@@ -335,7 +337,7 @@ function article_callback2(transport, id) {
        }
 }
 
-function view(id) {
+function view(id, activefeed, noexpand) {
        try {
                var oldrow = $("RROW-" + getActiveArticleId());
                if (oldrow) oldrow.removeClassName("active");
@@ -343,6 +345,11 @@ function view(id) {
                var crow = $("RROW-" + id);
 
                if (!crow) return;
+               if (noexpand) {
+                       setActiveArticleId(id);
+                       showArticleInHeadlines(id, noexpand);
+                       return;
+               }
 
                console.log("loading article: " + id);
 
@@ -498,7 +505,7 @@ function togglePub(id, client_only, no_effects, note) {
        }
 }
 
-function moveToPost(mode, noscroll) {
+function moveToPost(mode, noscroll, noexpand) {
 
        try {
 
@@ -545,13 +552,13 @@ function moveToPost(mode, noscroll) {
                                                scrollArticle(ctr.offsetHeight/4);
 
                                        } else if (next_id) {
-                                               cdmExpandArticle(next_id);
+                                               cdmExpandArticle(next_id, noexpand);
                                                cdmScrollToArticleId(next_id, true);
                                        }
 
                                } else if (next_id) {
                                        correctHeadlinesOffset(next_id);
-                                       view(next_id, getActiveFeedId());
+                                       view(next_id, getActiveFeedId(), noexpand);
                                }
                        }
                }
@@ -569,7 +576,7 @@ function moveToPost(mode, noscroll) {
                                                if (!noscroll && article.offsetTop < ctr.scrollTop) {
                                                        scrollArticle(-ctr.offsetHeight/4);
                                                } else {
-                                                       cdmExpandArticle(prev_id);
+                                                       cdmExpandArticle(prev_id, noexpand);
                                                        cdmScrollToArticleId(prev_id, true);
                                                }
                                        } else {
@@ -578,17 +585,17 @@ function moveToPost(mode, noscroll) {
                                                        scrollArticle(-ctr.offsetHeight/3);
                                                } else if (!noscroll && prev_article &&
                                                                prev_article.offsetTop < ctr.scrollTop) {
-                                                       cdmExpandArticle(prev_id);
+                                                       cdmExpandArticle(prev_id, noexpand);
                                                        scrollArticle(-ctr.offsetHeight/4);
                                                } else if (prev_id) {
-                                                       cdmExpandArticle(prev_id);
+                                                       cdmExpandArticle(prev_id, noexpand);
                                                        cdmScrollToArticleId(prev_id, noscroll);
                                                }
                                        }
 
                                } else if (prev_id) {
                                        correctHeadlinesOffset(prev_id);
-                                       view(prev_id, getActiveFeedId());
+                                       view(prev_id, getActiveFeedId(), noexpand);
                                }
                        }
                }
@@ -680,7 +687,7 @@ function selectionRemoveLabel(id, ids) {
                        return;
                }
 
-               var query = "?op=rpc&method=removeFromLabel&ids=" +
+               var query = "?op=article&method=removeFromLabel&ids=" +
                        param_escape(ids.toString()) + "&lid=" + param_escape(id);
 
                console.log(query);
@@ -708,7 +715,7 @@ function selectionAssignLabel(id, ids) {
                        return;
                }
 
-               var query = "?op=rpc&method=assignToLabel&ids=" +
+               var query = "?op=article&method=assignToLabel&ids=" +
                        param_escape(ids.toString()) + "&lid=" + param_escape(id);
 
                console.log(query);
@@ -941,23 +948,6 @@ function selectArticles(mode) {
        }
 }
 
-function catchupPage() {
-
-       var fn = getFeedName(getActiveFeedId(), activeFeedIsCat());
-
-       var str = __("Mark all visible articles in %s as read?");
-
-       str = str.replace("%s", fn);
-
-       if (getInitParam("confirm_feed_catchup") == 1 && !confirm(str)) {
-               return;
-       }
-
-       selectArticles('all');
-       selectionToggleUnread(false, 'viewCurrentFeed()', true);
-       selectArticles('none');
-}
-
 function deleteSelection() {
 
        try {
@@ -1084,7 +1074,7 @@ function catchupSelection() {
 }
 
 function editArticleTags(id) {
-               var query = "backend.php?op=dlg&method=editArticleTags&param=" + param_escape(id);
+               var query = "backend.php?op=article&method=editArticleTags&param=" + param_escape(id);
 
                if (dijit.byId("editTagsDlg"))
                        dijit.byId("editTagsDlg").destroyRecursive();
@@ -1102,22 +1092,25 @@ function editArticleTags(id) {
                                        new Ajax.Request("backend.php", {
                                        parameters: query,
                                        onComplete: function(transport) {
-                                               notify('');
-                                               dialog.hide();
+                                               try {
+                                                       notify('');
+                                                       dialog.hide();
 
-                                               var data = JSON.parse(transport.responseText);
+                                                       var data = JSON.parse(transport.responseText);
 
-                                               if (data) {
-                                                       var tags_str = article.tags;
-                                                       var id = tags_str.id;
+                                                       if (data) {
+                                                               var id = data.id;
 
-                                                       var tags = $("ATSTR-" + id);
-                                                       var tooltip = dijit.byId("ATSTRTIP-" + id);
+                                                               console.log(id);
 
-                                                       if (tags) tags.innerHTML = tags_str.content;
-                                                       if (tooltip) tooltip.attr('label', tags_str.content_full);
+                                                               var tags = $("ATSTR-" + id);
+                                                               var tooltip = dijit.byId("ATSTRTIP-" + id);
 
-                                                       cache_delete("article:" + id);
+                                                               if (tags) tags.innerHTML = data.content;
+                                                               if (tooltip) tooltip.attr('label', data.content_full);
+                                                       }
+                                               } catch (e) {
+                                                       exception_error("editArticleTags/inner", e);
                                                }
 
                                        }});
@@ -1130,7 +1123,7 @@ function editArticleTags(id) {
                dojo.disconnect(tmph);
 
                        new Ajax.Autocompleter('tags_str', 'tags_choices',
-                          "backend.php?op=rpc&method=completeTags",
+                          "backend.php?op=article&method=completeTags",
                           { tokens: ',', paramName: "search" });
                });
 
@@ -1167,58 +1160,14 @@ function getActiveArticleId() {
 
 function postMouseIn(e, id) {
        post_under_pointer = id;
-
-       if (_post_preview_timeout) window.clearTimeout(_post_preview_timeout);
-
-       /* if (!isCdmMode() || !getInitParam("cdm_expanded")) {
-               _post_preview_timeout = window.setTimeout(function() {
-                       displaySmallArticlePreview(e, id);
-               }, 1000);
-       } */
-}
-
-function displaySmallArticlePreview(e, id) {
-       try {
-               var query = "?op=rpc&method=cdmarticlepreview&id=" + id;
-
-               new Ajax.Request("backend.php", {
-                       parameters: query,
-                       onComplete: function(transport) {
-                               cexc = $("CEXC-" + id);
-                               preview = $("small_article_preview");
-                               row = $("RROW-" + id);
-                               ctr = $("headlines-frame");
-
-                               if (id != getActiveArticleId() && (!isCdmMode() || (cexc && Element.visible(cexc))) && row && preview) {
-                                       preview.innerHTML = transport.responseText;
-                                       new Effect.Appear(preview, {duration:0.2});
-
-                                       preview.setStyle({
-                                               left: (e.clientX + 20) + 'px',
-                                               top: (row.offsetTop + row.offsetHeight*2 + 20 - ctr.scrollTop) + 'px' });
-
-                               }
-
-                       } });
-
-
-       } catch (e) {
-               exception_error("displaySmallArticlePreview", e);
-       }
 }
 
 function postMouseOut(id) {
        post_under_pointer = false;
-
-       if (_post_preview_timeout) window.clearTimeout(_post_preview_timeout);
-
-       if (Element.visible("small_article_preview"))
-               Element.hide("small_article_preview");
 }
 
 function unpackVisibleHeadlines() {
        try {
-
                if (!isCdmMode()) return;
 
                $$("#headlines-frame > div[id*=RROW]").each(
@@ -1237,7 +1186,6 @@ function unpackVisibleHeadlines() {
                        }
                );
 
-
        } catch (e) {
                exception_error("unpackVisibleHeadlines", e);
        }
@@ -1268,6 +1216,10 @@ function headlines_scroll_handler(e) {
 
                if (getInitParam("cdm_auto_catchup") == 1) {
 
+                       // let's get DOM some time to settle down
+                       var ts = new Date().getTime();
+                       if (ts - _last_headlines_update < 100) return;
+
                        $$("#headlines-frame > div[id*=RROW][class*=Unread]").each(
                                function(child) {
                                        if (child.hasClassName("Unread") && $("headlines-frame").scrollTop >
@@ -1313,7 +1265,11 @@ function catchupBatchedArticles() {
                                onComplete: function(transport) {
                                        handle_rpc_json(transport);
 
+                                       reply = JSON.parse(transport.responseText);
+                                       var batch = reply.ids;
+
                                        batch.each(function(id) {
+                                               console.log(id);
                                                var elem = $("RROW-" + id);
                                                if (elem) elem.removeClassName("Unread");
                                                catchup_id_batch.remove(id);
@@ -1425,7 +1381,28 @@ function cdmCollapseArticle(event, id) {
        }
 }
 
-function cdmExpandArticle(id) {
+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);
+               }
+
+       } catch (e) {
+               exception_error("cdmUnexpandArticle", e);
+       }
+}
+
+function cdmExpandArticle(id, noexpand) {
        try {
                console.log("cdmExpandArticle " + id);
 
@@ -1462,7 +1439,7 @@ function cdmExpandArticle(id) {
 
                var cencw = $("CENCW-" + id);
 
-               if (!Element.visible(elem)) {
+               if (!Element.visible(elem) && !noexpand) {
                        if (cencw) {
                                cencw.innerHTML = htmlspecialchars_decode(cencw.innerHTML);
                                cencw.setAttribute('id', '');
@@ -1479,7 +1456,8 @@ function cdmExpandArticle(id) {
                if (old_offset > new_offset)
                        $("headlines-frame").scrollTop -= (old_offset-new_offset);
 
-               toggleUnread(id, 0, true);
+               if (!noexpand)
+                       toggleUnread(id, 0, true);
                toggleSelected(id);
                $("RROW-" + id).addClassName("active");
 
@@ -1553,6 +1531,8 @@ function dismissArticle(id) {
        try {
                var elem = $("RROW-" + id);
 
+               if (!elem) return;
+
                toggleUnread(id, 0, true);
 
                new Effect.Fade(elem, {duration : 0.5});
@@ -2077,7 +2057,7 @@ function setSelectionScore() {
                        var score = prompt(__("Please enter new score for selected articles:"), score);
 
                        if (score != undefined) {
-                               var query = "op=rpc&method=setScore&id=" + param_escape(ids.toString()) +
+                               var query = "op=article&method=setScore&id=" + param_escape(ids.toString()) +
                                        "&score=" + param_escape(score);
 
                                new Ajax.Request("backend.php", {
@@ -2120,7 +2100,7 @@ function changeScore(id, pic) {
 
                if (new_score != undefined) {
 
-                       var query = "op=rpc&method=setScore&id=" + param_escape(id) +
+                       var query = "op=article&method=setScore&id=" + param_escape(id) +
                                "&score=" + param_escape(new_score);
 
                        new Ajax.Request("backend.php", {