X-Git-Url: https://git.wh0rd.org/?p=tt-rss.git;a=blobdiff_plain;f=js%2Fviewfeed.js;h=6ae9cdd8a503fe42cd51c65775de293d81e41d2c;hp=5b237b47773d43e825978edd06d9feb9842af8bc;hb=0c06bb5fe1278b7d92926b21b000e9c966e19ee6;hpb=560b9fdd26c75aad829e8bd053c71b00df34c7e2 diff --git a/js/viewfeed.js b/js/viewfeed.js index 5b237b47..6ae9cdd8 100755 --- a/js/viewfeed.js +++ b/js/viewfeed.js @@ -490,7 +490,6 @@ function moveToPost(mode, noscroll, noexpand) { scrollArticle(ctr.offsetHeight/4); } else if (next_id) { - cdmExpandArticle(next_id, noexpand); cdmScrollToArticleId(next_id, true); } @@ -509,24 +508,14 @@ function moveToPost(mode, noscroll, noexpand) { const prev_article = $("RROW-" + prev_id); var ctr = $("headlines-frame"); - if (!getInitParam("cdm_expanded")) { - - if (!noscroll && article && article.offsetTop < ctr.scrollTop) { - scrollArticle(-ctr.offsetHeight/4); - } else { - cdmExpandArticle(prev_id, noexpand); - cdmScrollToArticleId(prev_id, true); - } - } else if (!noscroll && article && article.offsetTop < ctr.scrollTop) { - scrollArticle(-ctr.offsetHeight/3); - } else if (!noscroll && prev_article && - prev_article.offsetTop < ctr.scrollTop) { - cdmExpandArticle(prev_id, noexpand); - scrollArticle(-ctr.offsetHeight/4); - } else if (prev_id) { - cdmExpandArticle(prev_id, noexpand); - cdmScrollToArticleId(prev_id, noscroll); - } + if (!noscroll && article && article.offsetTop < ctr.scrollTop) { + scrollArticle(-ctr.offsetHeight/3); + } else if (!noscroll && prev_article && + prev_article.offsetTop < ctr.scrollTop) { + scrollArticle(-ctr.offsetHeight/4); + } else if (prev_id) { + cdmScrollToArticleId(prev_id, noscroll); + } } else if (prev_id) { correctHeadlinesOffset(prev_id); @@ -855,65 +844,55 @@ function deleteSelection() { return; } - const query = "?op=rpc&method=delete&ids=" + param_escape(rows); + const query = { op: "rpc", method: "delete", ids: rows.toString() }; - console.log(query); - - new Ajax.Request("backend.php", { - parameters: query, - onComplete: function (transport) { - handle_rpc_json(transport); - viewCurrentFeed(); - } + xhrPost("backend.php", query, (transport) => { + handle_rpc_json(transport); + viewCurrentFeed(); }); } function archiveSelection() { - const rows = getSelectedArticleIds2(); + const rows = getSelectedArticleIds2(); - if (rows.length == 0) { - alert(__("No articles are selected.")); - return; - } + if (rows.length == 0) { + alert(__("No articles are selected.")); + return; + } - const fn = getFeedName(getActiveFeedId(), activeFeedIsCat()); - let str; - let op; + const fn = getFeedName(getActiveFeedId(), activeFeedIsCat()); + let str; + let op; - if (getActiveFeedId() != 0) { - str = ngettext("Archive %d selected article in %s?", "Archive %d selected articles in %s?", rows.length); - op = "archive"; - } else { - str = ngettext("Move %d archived article back?", "Move %d archived articles back?", rows.length); + if (getActiveFeedId() != 0) { + str = ngettext("Archive %d selected article in %s?", "Archive %d selected articles in %s?", rows.length); + op = "archive"; + } else { + str = ngettext("Move %d archived article back?", "Move %d archived articles back?", rows.length); - str += " " + __("Please note that unstarred articles might get purged on next feed update."); + str += " " + __("Please note that unstarred articles might get purged on next feed update."); - op = "unarchive"; - } + op = "unarchive"; + } - str = str.replace("%d", rows.length); - str = str.replace("%s", fn); - - if (getInitParam("confirm_feed_catchup") == 1 && !confirm(str)) { - return; - } + str = str.replace("%d", rows.length); + str = str.replace("%s", fn); - const query = "?op=rpc&method="+op+"&ids=" + param_escape(rows); + if (getInitParam("confirm_feed_catchup") == 1 && !confirm(str)) { + return; + } - console.log(query); + for (let i = 0; i < rows.length; i++) { + cache_delete("article:" + rows[i]); + } - for (let i = 0; i < rows.length; i++) { - cache_delete("article:" + rows[i]); - } - - new Ajax.Request("backend.php", { - parameters: query, - onComplete: function(transport) { - handle_rpc_json(transport); - viewCurrentFeed(); - } }); + const query = {op: "rpc", method: op, ids: rows.toString()}; + xhrPost("backend.php", query, (transport) => { + handle_rpc_json(transport); + viewCurrentFeed(); + }); } function catchupSelection() { @@ -955,31 +934,26 @@ function editArticleTags(id) { notify_progress("Saving article tags...", true); - new Ajax.Request("backend.php", { - parameters: query, - onComplete: function(transport) { - try { - notify(''); - dialog.hide(); + xhrPost("backend.php", this.attr('value'), (transport) => { + try { + notify(''); + dialog.hide(); - const data = JSON.parse(transport.responseText); + const data = JSON.parse(transport.responseText); - if (data) { - const id = data.id; + if (data) { + const id = data.id; - console.log(id); + const tags = $("ATSTR-" + id); + const tooltip = dijit.byId("ATSTRTIP-" + id); - const tags = $("ATSTR-" + id); - const tooltip = dijit.byId("ATSTRTIP-" + id); - - if (tags) tags.innerHTML = data.content; - if (tooltip) tooltip.attr('label', data.content_full); - } - } catch (e) { - exception_error(e); - } - - }}); + if (tags) tags.innerHTML = data.content; + if (tooltip) tooltip.attr('label', data.content_full); + } + } catch (e) { + exception_error(e); + } + }); } }, href: query @@ -1031,26 +1005,26 @@ function postMouseOut(id) { } function unpackVisibleHeadlines() { - if (!isCdmMode() || !getInitParam("cdm_expanded")) return; + if (!isCdmMode()) return; - $$("#headlines-frame span.cencw[id]").each( - function (child) { - const row = $("RROW-" + child.id.replace("CENCW-", "")); + const rows = $$("#headlines-frame div[id*=RROW][data-content]"); - if (row && row.offsetTop <= $("headlines-frame").scrollTop + - $("headlines-frame").offsetHeight) { + for (let i = 0; i < rows.length; i++) { + const row = rows[i]; - //console.log("unpacking: " + child.id); + if (row.offsetTop <= $("headlines-frame").scrollTop + $("headlines-frame").offsetHeight) { + console.log("unpacking: " + row.id); - child.innerHTML = htmlspecialchars_decode(child.innerHTML); - child.removeAttribute('id'); + const content = row.getAttribute("data-content"); - PluginHost.run(PluginHost.HOOK_ARTICLE_RENDERED_CDM, row); + row.select(".cdmContentInner")[0].innerHTML = content; + row.removeAttribute("data-content"); - Element.show(child); - } - } - ); + PluginHost.run(PluginHost.HOOK_ARTICLE_RENDERED_CDM, row); + } else { + break; + } + } } function headlines_scroll_handler(e) { @@ -1063,30 +1037,27 @@ function headlines_scroll_handler(e) { _headlines_scroll_offset = e.scrollTop; - const hsp = $("headlines-spacer"); - unpackVisibleHeadlines(); // set topmost child in the buffer as active if (isCdmMode() && getInitParam("cdm_auto_catchup") == 1 && - getSelectedArticleIds2().length <= 1 && - getInitParam("cdm_expanded")) { + getSelectedArticleIds2().length <= 1) { const rows = $$("#headlines-frame > div[id*=RROW]"); for (let i = 0; i < rows.length; i++) { - const child = rows[i]; + const row = rows[i]; - if ($("headlines-frame").scrollTop <= child.offsetTop && - child.offsetTop - $("headlines-frame").scrollTop < 100 && - child.getAttribute("data-article-id") != _active_article_id) { + if ($("headlines-frame").scrollTop <= row.offsetTop && + row.offsetTop - $("headlines-frame").scrollTop < 100 && + row.getAttribute("data-article-id") != _active_article_id) { if (_active_article_id) { const row = $("RROW-" + _active_article_id); if (row) row.removeClassName("active"); } - _active_article_id = child.getAttribute("data-article-id"); + _active_article_id = row.getAttribute("data-article-id"); showArticleInHeadlines(_active_article_id, true); updateSelectedPrompt(); break; @@ -1095,6 +1066,8 @@ function headlines_scroll_handler(e) { } if (!_infscroll_disable) { + const hsp = $("headlines-spacer"); + if (hsp && hsp.offsetTop - 250 <= e.scrollTop + e.offsetHeight) { hsp.innerHTML = " " + @@ -1110,33 +1083,31 @@ function headlines_scroll_handler(e) { updateFloatingTitle(); } - catchupCurrentBatchIfNeeded(); - if (getInitParam("cdm_auto_catchup") == 1) { - // let's get DOM some time to settle down - const ts = new Date().getTime(); - if (ts - _last_headlines_update < 100) return; + let rows = $$("#headlines-frame > div[id*=RROW][class*=Unread]"); - $$("#headlines-frame > div[id*=RROW][class*=Unread]").each( - function(child) { - if ($("headlines-frame").scrollTop > (child.offsetTop + child.offsetHeight/2)) { + for (let i = 0; i < rows.length; i++) { + const row = rows[i]; + + if ($("headlines-frame").scrollTop > (row.offsetTop + row.offsetHeight/2)) { - const id = child.getAttribute("data-article-id") + const id = row.getAttribute("data-article-id") - if (catchup_id_batch.indexOf(id) == -1) - catchup_id_batch.push(id); + if (catchup_id_batch.indexOf(id) == -1) + catchup_id_batch.push(id); - //console.log("auto_catchup_batch: " + catchup_id_batch.toString()); - } - - }); + //console.log("auto_catchup_batch: " + catchup_id_batch.toString()); + } else { + break; + } + } if (_infscroll_disable) { - const child = $$("#headlines-frame div[id*=RROW]").last(); + const row = $$("#headlines-frame div[id*=RROW]").last(); - if (child && $("headlines-frame").scrollTop > - (child.offsetTop + child.offsetHeight - 50)) { + if (row && $("headlines-frame").scrollTop > + (row.offsetTop + row.offsetHeight - 50)) { console.log("we seem to be at an end"); @@ -1161,37 +1132,31 @@ function openNextUnreadFeed() { function catchupBatchedArticles() { if (catchup_id_batch.length > 0 && !_infscroll_request_sent && !_catchup_request_sent) { - console.log("catchupBatchedArticles: working"); + console.log("catchupBatchedArticles, size=", catchup_id_batch.length); // make a copy of the array const batch = catchup_id_batch.slice(); - const query = "?op=rpc&method=catchupSelected" + - "&cmode=0&ids=" + param_escape(batch.toString()); - - console.log(query); + const query = { op: "rpc", method: "catchupSelected", + cmode: 0, ids: batch.toString() }; _catchup_request_sent = true; - new Ajax.Request("backend.php", { - parameters: query, - onComplete: function (transport) { - handle_rpc_json(transport); - - _catchup_request_sent = false; + xhrPost("backend.php", query, (transport) => { + const reply = handle_rpc_json(transport); - const reply = JSON.parse(transport.responseText); - const batch = reply.ids; + _catchup_request_sent = false; - batch.each(function (id) { - console.log(id); - const elem = $("RROW-" + id); - if (elem) elem.removeClassName("Unread"); - catchup_id_batch.remove(id); - }); + if (reply) { + const batch = reply.ids; - updateFloatingTitle(true); + batch.each(function (id) { + const elem = $("RROW-" + id); + if (elem) elem.removeClassName("Unread"); + catchup_id_batch.remove(id); + }); + } - } + updateFloatingTitle(true); }); } } @@ -1247,125 +1212,16 @@ function catchupRelativeToArticle(below, id) { e.removeClassName("Unread"); } - const query = "?op=rpc&method=catchupSelected" + - "&cmode=0" + "&ids=" + param_escape(ids_to_mark.toString()); + const query = { op: "rpc", method: "catchupSelected", + cmode: 0, ids: ids_to_mark.toString() }; - new Ajax.Request("backend.php", { - parameters: query, - onComplete: function (transport) { - handle_rpc_json(transport); - } + xhrPost("backend.php", query, (transport) => { + handle_rpc_json(transport); }); - - } - } -} - -function cdmCollapseArticle(event, id, unmark) { - if (unmark == undefined) unmark = true; - - const row = $("RROW-" + id); - const elem = $("CICD-" + id); - - if (elem && row) { - const collapse = row.select("span[class='collapseBtn']")[0]; - - Element.hide(elem); - Element.show("CEXC-" + id); - Element.hide(collapse); - - if (unmark) { - row.removeClassName("active"); - - markHeadline(id, false); - - if (id == getActiveArticleId()) { - setActiveArticleId(0); - } - - updateSelectedPrompt(); } - - if (event) Event.stop(event); - - PluginHost.run(PluginHost.HOOK_ARTICLE_COLLAPSED, id); - - if (row.offsetTop < $("headlines-frame").scrollTop) - scrollToRowId(row.id); - - $("floatingTitle").style.visibility = "hidden"; - $("floatingTitle").setAttribute("data-article-id", 0); } } -function cdmExpandArticle(id, noexpand) { - console.log("cdmExpandArticle " + id); - - const row = $("RROW-" + id); - - if (!row) return false; - - const oldrow = $("RROW-" + getActiveArticleId()); - - let elem = $("CICD-" + getActiveArticleId()); - - if (id == getActiveArticleId() && Element.visible(elem)) - return true; - - selectArticles("none"); - - const old_offset = row.offsetTop; - - if (getActiveArticleId() && elem && !getInitParam("cdm_expanded")) { - let collapse = oldrow.select("span[class='collapseBtn']")[0]; - - Element.hide(elem); - Element.show("CEXC-" + getActiveArticleId()); - Element.hide(collapse); - } - - if (oldrow) oldrow.removeClassName("active"); - - setActiveArticleId(id); - - elem = $("CICD-" + id); - - let collapse = row.select("span[class='collapseBtn']")[0]; - - const cencw = $("CENCW-" + id); - - if (!Element.visible(elem) && !noexpand) { - if (cencw) { - cencw.innerHTML = htmlspecialchars_decode(cencw.innerHTML); - cencw.setAttribute('id', ''); - Element.show(cencw); - } - - Element.show(elem); - Element.hide("CEXC-" + id); - Element.show(collapse); - } - - const new_offset = row.offsetTop; - - if (old_offset > new_offset) - $("headlines-frame").scrollTop -= (old_offset - new_offset); - - if (!noexpand) { - if (catchup_id_batch.indexOf(id) == -1) - catchup_id_batch.push(id); - - catchupCurrentBatchIfNeeded(); - } - - toggleSelected(id); - row.addClassName("active"); - - PluginHost.run(PluginHost.HOOK_ARTICLE_EXPANDED, id); - - return false; -} - function getArticleUnderPointer() { return post_under_pointer; } @@ -1402,43 +1258,37 @@ function cdmClicked(event, id, in_body) { if (!event.ctrlKey && !event.metaKey) { - if (!getInitParam("cdm_expanded")) { - return cdmExpandArticle(id); - } else { - - let elem = $("RROW-" + getActiveArticleId()); + let elem = $("RROW-" + getActiveArticleId()); - if (elem) elem.removeClassName("active"); + if (elem) elem.removeClassName("active"); - selectArticles("none"); - toggleSelected(id); + selectArticles("none"); + toggleSelected(id); - elem = $("RROW-" + id); - const article_is_unread = elem.hasClassName("Unread"); + elem = $("RROW-" + id); + const article_is_unread = elem.hasClassName("Unread"); - elem.removeClassName("Unread"); - elem.addClassName("active"); + elem.removeClassName("Unread"); + elem.addClassName("active"); - setActiveArticleId(id); + setActiveArticleId(id); - if (article_is_unread) { - decrementFeedCounter(getActiveFeedId(), activeFeedIsCat()); - updateFloatingTitle(true); - } + if (article_is_unread) { + decrementFeedCounter(getActiveFeedId(), activeFeedIsCat()); + updateFloatingTitle(true); - const query = "?op=rpc&method=catchupSelected" + - "&cmode=0&ids=" + param_escape(id); + const query = { + op: "rpc", method: "catchupSelected", + cmode: 0, ids: id + }; - new Ajax.Request("backend.php", { - parameters: query, - onComplete: function (transport) { - handle_rpc_json(transport); - } + xhrPost("backend.php", query, (transport) => { + handle_rpc_json(transport); }); - - return !event.shiftKey; } + return !event.shiftKey; + } else if (!in_body) { toggleSelected(id, true); @@ -1812,31 +1662,25 @@ function setSelectionScore() { const score = prompt(__("Please enter new score for selected articles:")); if (score != undefined) { - const query = "op=article&method=setScore&id=" + param_escape(ids.toString()) + - "&score=" + param_escape(score); - - new Ajax.Request("backend.php", { - parameters: query, - onComplete: function (transport) { - const reply = JSON.parse(transport.responseText); - if (reply) { - console.log(ids); - - ids.each(function (id) { - const row = $("RROW-" + id); - - if (row) { - const pic = row.getElementsByClassName("hlScorePic")[0]; - - if (pic) { - pic.src = pic.src.replace(/score_.*?\.png/, - reply["score_pic"]); - pic.setAttribute("score", score); - } - } - }); - } - } + const query = { op: "article", method: "setScore", id: ids.toString(), + score: score }; + + xhrJson("backend.php", query, (reply) => { + if (reply) { + reply.id.each((id) => { + const row = $("RROW-" + id); + + if (row) { + const pic = row.getElementsByClassName("hlScorePic")[0]; + + if (pic) { + pic.src = pic.src.replace(/score_.*?\.png/, + reply["score_pic"]); + pic.setAttribute("score", reply["score"]); + } + } + }); + } }); } @@ -1845,6 +1689,7 @@ function setSelectionScore() { } } +/* function updateScore(id) { const pic = $$("#RROW-" + id + " .hlScorePic")[0]; @@ -1867,7 +1712,7 @@ function updateScore(id) { } }); } -} +} */ function changeScore(id, pic) { const score = pic.getAttribute("score"); @@ -1875,38 +1720,27 @@ function changeScore(id, pic) { const new_score = prompt(__("Please enter new score for this article:"), score); if (new_score != undefined) { - - const query = "op=article&method=setScore&id=" + param_escape(id) + - "&score=" + param_escape(new_score); - - new Ajax.Request("backend.php", { - parameters: query, - onComplete: function (transport) { - const reply = JSON.parse(transport.responseText); - - if (reply) { - pic.src = pic.src.replace(/score_.*?\.png/, reply["score_pic"]); - pic.setAttribute("score", new_score); - pic.setAttribute("title", new_score); - } - } + const query = { op: "article", method: "setScore", id: id, score: new_score }; + + xhrJson("backend.php", query, (reply) => { + if (reply) { + pic.src = pic.src.replace(/score_.*?\.png/, reply["score_pic"]); + pic.setAttribute("score", new_score); + pic.setAttribute("title", new_score); + } }); } } function displayArticleUrl(id) { - const query = "op=rpc&method=getlinktitlebyid&id=" + param_escape(id); + const query = { op: "rpc", method: "getlinktitlebyid", id: id }; - new Ajax.Request("backend.php", { - parameters: query, - onComplete: function (transport) { - const reply = JSON.parse(transport.responseText); - - if (reply && reply.link) { - prompt(__("Article URL:"), reply.link); - } - } + xhrJson("backend.php", query, (reply) => { + if (reply && reply.link) { + prompt(__("Article URL:"), reply.link); + } }); + } function scrollToRowId(id) { @@ -1966,14 +1800,3 @@ function updateFloatingTitle(unread_only) { } } } - -function catchupCurrentBatchIfNeeded() { - if (catchup_id_batch.length > 0) { - window.clearTimeout(catchup_timeout_id); - catchup_timeout_id = window.setTimeout(catchupBatchedArticles, 1000); - - if (catchup_id_batch.length >= 10) { - catchupBatchedArticles(); - } - } -}