X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=js%2Fviewfeed.js;h=072f6c9cb02a373c41f1df68d012a1f12194ee75;hb=b9585004e68fdd7718e042083a4d9fb2dc351e0c;hp=0e451166fded6c8dfec2420506baa729aad0d6e6;hpb=9dc5524df1a91252eee3247d2b8b2549df79150f;p=tt-rss.git diff --git a/js/viewfeed.js b/js/viewfeed.js index 0e451166..072f6c9c 100755 --- a/js/viewfeed.js +++ b/js/viewfeed.js @@ -5,7 +5,7 @@ let _active_article_id = 0; let vgroup_last_feed = false; let post_under_pointer = false; -let last_requested_article = false; +let last_requested_article = 0; let catchup_id_batch = []; let catchup_timeout_id = false; @@ -22,20 +22,15 @@ let _catchup_request_sent = false; let has_storage = 'sessionStorage' in window && window['sessionStorage'] !== null; function headlines_callback2(transport, offset, background, infscroll_req) { - handle_rpc_json(transport); + const reply = handle_rpc_json(transport); console.log("headlines_callback2 [offset=" + offset + "] B:" + background + " I:" + infscroll_req); - let is_cat = false; - let feed_id = false; + if (background) + return; - let reply = false; - - try { - reply = JSON.parse(transport.responseText); - } catch (e) { - console.error(e); - } + var is_cat = false; + var feed_id = false; if (reply) { @@ -43,20 +38,9 @@ function headlines_callback2(transport, offset, background, infscroll_req) { feed_id = reply['headlines']['id']; last_search_query = reply['headlines']['search_query']; - if (background) { - let content = reply['headlines']['content']; - - content = content + "
"; - return; - } - if (feed_id != -7 && (feed_id != getActiveFeedId() || is_cat != activeFeedIsCat())) return; - /* dijit.getEnclosingWidget( - document.forms["main_toolbar_form"].update).attr('disabled', - is_cat || feed_id <= 0); */ - try { if (infscroll_req == false) { $("headlines-frame").scrollTop = 0; @@ -85,7 +69,6 @@ function headlines_callback2(transport, offset, background, infscroll_req) { current_first_id = reply['headlines']['first_id']; const counters = reply['counters']; const articles = reply['articles']; - //var runtime_info = reply['runtime-info']; if (infscroll_req == false) { loaded_article_ids = []; @@ -94,17 +77,9 @@ function headlines_callback2(transport, offset, background, infscroll_req) { reply['headlines']['toolbar'], {parseContent: true}); - /*dojo.html.set($("headlines-frame"), - reply['headlines']['content'], - {parseContent: true}); - - $$("#headlines-frame div[id*='RROW']").each(function(row) { - loaded_article_ids.push(row.id); - });*/ - $("headlines-frame").innerHTML = ''; - var tmp = new Element("div"); + let tmp = document.createElement("div"); tmp.innerHTML = reply['headlines']['content']; dojo.parser.parse(tmp); @@ -118,7 +93,7 @@ function headlines_callback2(transport, offset, background, infscroll_req) { } } - var hsp = $("headlines-spacer"); + let hsp = $("headlines-spacer"); if (!hsp) hsp = new Element("DIV", {"id": "headlines-spacer"}); dijit.byId('headlines-frame').domNode.appendChild(hsp); @@ -140,17 +115,17 @@ function headlines_callback2(transport, offset, background, infscroll_req) { const c = dijit.byId("headlines-frame"); const ids = getSelectedArticleIds2(); - var hsp = $("headlines-spacer"); + let hsp = $("headlines-spacer"); if (hsp) c.domNode.removeChild(hsp); - var tmp = new Element("div"); + let tmp = document.createElement("div"); tmp.innerHTML = reply['headlines']['content']; dojo.parser.parse(tmp); while (tmp.hasChildNodes()) { - var row = tmp.removeChild(tmp.firstChild); + let row = tmp.removeChild(tmp.firstChild); if (loaded_article_ids.indexOf(row.id) == -1 || row.hasClassName("cdmFeedTitle")) { dijit.byId("headlines-frame").domNode.appendChild(row); @@ -166,7 +141,7 @@ function headlines_callback2(transport, offset, background, infscroll_req) { console.log("restore selected ids: " + ids); - for (var i = 0; i < ids.length; i++) { + for (let i = 0; i < ids.length; i++) { markHeadline(ids[i]); } @@ -183,7 +158,7 @@ function headlines_callback2(transport, offset, background, infscroll_req) { const first_id_changed = reply['headlines']['first_id_changed']; console.log("first id changed:" + first_id_changed); - var hsp = $("headlines-spacer"); + let hsp = $("headlines-spacer"); if (hsp) { if (first_id_changed) { @@ -199,7 +174,7 @@ function headlines_callback2(transport, offset, background, infscroll_req) { } if (articles) { - for (var i = 0; i < articles.length; i++) { + for (let i = 0; i < articles.length; i++) { const a_id = articles[i]['id']; cache_set("article:" + a_id, articles[i]['content']); } @@ -276,15 +251,7 @@ function showArticleInHeadlines(id, noexpand) { function article_callback2(transport, id) { console.log("article_callback2 " + id); - handle_rpc_json(transport); - - let reply = false; - - try { - reply = JSON.parse(transport.responseText); - } catch (e) { - console.error(e); - } + const reply = handle_rpc_json(transport); if (reply) { @@ -297,11 +264,6 @@ function article_callback2(transport, id) { cache_set("article:" + article['id'], article['content']); }); -// if (id != last_requested_article) { -// console.log("requested article id is out of sequence, aborting"); -// return; -// } - } else { console.error("Invalid object received: " + transport.responseText); @@ -309,7 +271,7 @@ function article_callback2(transport, id) { __('Could not display article (invalid object received - see error console for details)') + ""); } - const unread_in_buffer = $$("#headlines-frame > div[id*=RROW][class*=Unread]").length + const unread_in_buffer = $$("#headlines-frame > div[id*=RROW][class*=Unread]").length; request_counters(unread_in_buffer == 0); notify(""); @@ -334,7 +296,7 @@ function view(id, activefeed, noexpand) { console.log("cache check result: " + (cached_article != false)); - let query = "?op=article&method=view&id=" + param_escape(id); + const query = {op: "article", method: "view", id: id}; const neighbor_ids = getRelativePostIds(id); @@ -352,7 +314,7 @@ function view(id, activefeed, noexpand) { console.log("additional ids: " + cids_to_request.toString()); - query = query + "&cids=" + cids_to_request.toString(); + query.cids = cids_to_request.toString(); const article_is_unread = crow.hasClassName("Unread"); @@ -360,14 +322,10 @@ function view(id, activefeed, noexpand) { showArticleInHeadlines(id); if (cached_article && article_is_unread) { - - query = query + "&mode=prefetch"; - + query.mode = "prefetch"; render_article(cached_article); - } else if (cached_article) { - - query = query + "&mode=prefetch_old"; + query.mode = "prefetch_old"; render_article(cached_article); // if we don't need to request any relative ids, we might as well skip @@ -385,18 +343,16 @@ function view(id, activefeed, noexpand) { decrementFeedCounter(getActiveFeedId(), activeFeedIsCat()); } - new Ajax.Request("backend.php", { - parameters: query, - onComplete: function(transport) { - article_callback2(transport, id); - } }); + xhrPost("backend.php", query, (transport) => { + article_callback2(transport, id); + }) return false; } function toggleMark(id, client_only) { - let query = "?op=rpc&id=" + id + "&method=mark"; + const query = { op: "rpc", id: id, method: "mark" }; const row = $("RROW-" + id); if (!row) return; @@ -405,7 +361,7 @@ function toggleMark(id, client_only) { const row_imgs = row.getElementsByClassName("markedPic"); - for (var i = 0; i < row_imgs.length; i++) + for (let i = 0; i < row_imgs.length; i++) imgs.push(row_imgs[i]); const ft = $("floatingTitle"); @@ -422,32 +378,28 @@ function toggleMark(id, client_only) { if (!row.hasClassName("marked")) { img.src = img.src.replace("mark_unset", "mark_set"); - query = query + "&mark=1"; + query.mark = 1; } else { img.src = img.src.replace("mark_set", "mark_unset"); - query = query + "&mark=0"; + query.mark = 0; } } row.toggleClassName("marked"); - if (!client_only) { - new Ajax.Request("backend.php", { - parameters: query, - onComplete: function (transport) { - handle_rpc_json(transport); - } + if (!client_only) + xhrPost("backend.php", query, (transport) => { + handle_rpc_json(transport); }); } -} function togglePub(id, client_only, no_effects, note) { - let query = "?op=rpc&id=" + id + "&method=publ"; + const query = { op: "rpc", id: id, method: "publ" }; if (note != undefined) { - query = query + "¬e=" + param_escape(note); + query.note = note; } else { - query = query + "¬e=undefined"; + query.note = "undefined"; } const row = $("RROW-" + id); @@ -457,7 +409,7 @@ function togglePub(id, client_only, no_effects, note) { const row_imgs = row.getElementsByClassName("pubPic"); - for (var i = 0; i < row_imgs.length; i++) + for (let i = 0; i < row_imgs.length; i++) imgs.push(row_imgs[i]); const ft = $("floatingTitle"); @@ -465,19 +417,19 @@ function togglePub(id, client_only, no_effects, note) { if (ft && ft.getAttribute("data-article-id") == id) { const fte = ft.getElementsByClassName("pubPic"); - for (var i = 0; i < fte.length; i++) + for (let i = 0; i < fte.length; i++) imgs.push(fte[i]); } - for (var i = 0; i < imgs.length; i++) { + for (let i = 0; i < imgs.length; i++) { const img = imgs[i]; if (!row.hasClassName("published") || note != undefined) { img.src = img.src.replace("pub_unset", "pub_set"); - query = query + "&pub=1"; + query.pub = 1; } else { img.src = img.src.replace("pub_set", "pub_unset"); - query = query + "&pub=0"; + query.pub = 0; } } @@ -486,14 +438,10 @@ function togglePub(id, client_only, no_effects, note) { else row.toggleClassName("published"); - if (!client_only) { - new Ajax.Request("backend.php", { - parameters: query, - onComplete: function(transport) { + if (!client_only) + xhrPost("backend.php", query, (transport) => { handle_rpc_json(transport); - } }); - } - + }); } function moveToPost(mode, noscroll, noexpand) { @@ -542,7 +490,6 @@ function moveToPost(mode, noscroll, noexpand) { scrollArticle(ctr.offsetHeight/4); } else if (next_id) { - cdmExpandArticle(next_id, noexpand); cdmScrollToArticleId(next_id, true); } @@ -561,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); @@ -624,7 +561,7 @@ function updateSelectedPrompt() { } -function toggleUnread(id, cmode, effect) { +function toggleUnread(id, cmode) { const row = $("RROW-" + id); if (row) { const tmpClassName = row.className; @@ -645,22 +582,17 @@ function toggleUnread(id, cmode, effect) { row.addClassName("Unread"); } - if (cmode == undefined) cmode = 2; - - const query = "?op=rpc&method=catchupSelected" + - "&cmode=" + param_escape(cmode) + "&ids=" + param_escape(id); + if (tmpClassName != row.className) { + if (cmode == undefined) cmode = 2; -// notify_progress("Loading, please wait..."); + const query = {op: "rpc", method: "catchupSelected", + cmode: cmode, ids: id}; - if (tmpClassName != row.className) { - new Ajax.Request("backend.php", { - parameters: query, - onComplete: function (transport) { + xhrPost("backend.php", query, (transport) => { handle_rpc_json(transport); - } + }); } - } } @@ -672,18 +604,13 @@ function selectionRemoveLabel(id, ids) { return; } - const query = "?op=article&method=removeFromLabel&ids=" + - param_escape(ids.toString()) + "&lid=" + param_escape(id); - - console.log(query); - - new Ajax.Request("backend.php", { - parameters: query, - onComplete: function(transport) { - handle_rpc_json(transport); - show_labels_in_headlines(transport); - } }); + const query = { op: "article", method: "removeFromLabel", + ids: ids.toString(), lid: id }; + xhrPost("backend.php", query, (transport) => { + handle_rpc_json(transport); + show_labels_in_headlines(transport); + }); } function selectionAssignLabel(id, ids) { @@ -694,17 +621,13 @@ function selectionAssignLabel(id, ids) { return; } - const query = "?op=article&method=assignToLabel&ids=" + - param_escape(ids.toString()) + "&lid=" + param_escape(id); - - console.log(query); + const query = { op: "article", method: "assignToLabel", + ids: ids.toString(), lid: id }; - new Ajax.Request("backend.php", { - parameters: query, - onComplete: function(transport) { - handle_rpc_json(transport); - show_labels_in_headlines(transport); - } }); + xhrPost("backend.php", query, (transport) => { + handle_rpc_json(transport); + show_labels_in_headlines(transport); + }); } function selectionToggleUnread(set_state, callback, no_error, ids) { @@ -750,17 +673,15 @@ function selectionToggleUnread(set_state, callback, no_error, ids) { cmode = "0"; } - const query = "?op=rpc&method=catchupSelected" + - "&cmode=" + cmode + "&ids=" + param_escape(rows.toString()); + const query = {op: "rpc", method: "catchupSelected", + cmode: cmode, ids: rows.toString() }; notify_progress("Loading, please wait..."); - new Ajax.Request("backend.php", { - parameters: query, - onComplete: function(transport) { - handle_rpc_json(transport); - if (callback) callback(transport); - } }); + xhrPost("backend.php", query, (transport) => { + handle_rpc_json(transport); + if (callback) callback(transport); + }); } } @@ -779,17 +700,13 @@ function selectionToggleMarked(sel_state, callback, no_error, ids) { } if (rows.length > 0) { + const query = { op: "rpc", method: "markSelected", + ids: rows.toString(), cmode: 2 }; - const query = "?op=rpc&method=markSelected&ids=" + - param_escape(rows.toString()) + "&cmode=2"; - - new Ajax.Request("backend.php", { - parameters: query, - onComplete: function(transport) { - handle_rpc_json(transport); - if (callback) callback(transport); - } }); - + xhrPost("backend.php", query, (transport) => { + handle_rpc_json(transport); + if (callback) callback(transport); + }); } } @@ -807,16 +724,13 @@ function selectionTogglePublished(sel_state, callback, no_error, ids) { } if (rows.length > 0) { + const query = { op: "rpc", method: "publishSelected", + ids: rows.toString(), cmode: 2 }; - const query = "?op=rpc&method=publishSelected&ids=" + - param_escape(rows.toString()) + "&cmode=2"; - - new Ajax.Request("backend.php", { - parameters: query, - onComplete: function(transport) { - handle_rpc_json(transport); - } }); - + xhrPost("backend.php", query, (transport) => { + handle_rpc_json(transport); + if (callback) callback(transport); + }); } } @@ -854,7 +768,7 @@ function selectArticles(mode, query) { const children = $$(query); children.each(function(child) { - const id = child.getAttribute("data-article-id"); + //const id = child.getAttribute("data-article-id"); const cb = dijit.getEnclosingWidget( child.getElementsByClassName("rchk")[0]); @@ -930,65 +844,55 @@ function deleteSelection() { return; } - const query = "?op=rpc&method=delete&ids=" + param_escape(rows); - - console.log(query); + const query = { op: "rpc", method: "delete", ids: rows.toString() }; - 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(); - - if (rows.length == 0) { - alert(__("No articles are selected.")); - return; - } - - const fn = getFeedName(getActiveFeedId(), activeFeedIsCat()); - let str; - let op; + const rows = getSelectedArticleIds2(); - 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 (rows.length == 0) { + alert(__("No articles are selected.")); + return; + } - str += " " + __("Please note that unstarred articles might get purged on next feed update."); + const fn = getFeedName(getActiveFeedId(), activeFeedIsCat()); + let str; + let op; - op = "unarchive"; - } + 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 = str.replace("%d", rows.length); - str = str.replace("%s", fn); + str += " " + __("Please note that unstarred articles might get purged on next feed update."); - if (getInitParam("confirm_feed_catchup") == 1 && !confirm(str)) { - return; - } + op = "unarchive"; + } - const query = "?op=rpc&method="+op+"&ids=" + param_escape(rows); + str = str.replace("%d", rows.length); + str = str.replace("%s", fn); - console.log(query); + if (getInitParam("confirm_feed_catchup") == 1 && !confirm(str)) { + return; + } - 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() { @@ -1030,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(); - - const data = JSON.parse(transport.responseText); + xhrPost("backend.php", this.attr('value'), (transport) => { + try { + notify(''); + dialog.hide(); - if (data) { - const id = data.id; + const data = JSON.parse(transport.responseText); - console.log(id); + if (data) { + const id = data.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 @@ -1106,26 +1005,24 @@ function postMouseOut(id) { } function unpackVisibleHeadlines() { - if (!isCdmMode() || !getInitParam("cdm_expanded")) return; - - $$("#headlines-frame span.cencw[id]").each( - function (child) { - const row = $("RROW-" + child.id.replace("CENCW-", "")); + if (!isCdmMode()) return; - if (row && row.offsetTop <= $("headlines-frame").scrollTop + - $("headlines-frame").offsetHeight) { + $$("#headlines-frame div[id*=RROW][data-content]").each((row) => { + //console.log('checking', row.id); - //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 { + throw $break; } - ); + }); } function headlines_scroll_handler(e) { @@ -1144,8 +1041,7 @@ function headlines_scroll_handler(e) { // 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]"); @@ -1240,33 +1136,28 @@ function catchupBatchedArticles() { // 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); + xhrPost("backend.php", query, (transport) => { + const reply = handle_rpc_json(transport); - _catchup_request_sent = false; + _catchup_request_sent = false; - const reply = JSON.parse(transport.responseText); - const batch = reply.ids; + if (reply) { + const batch = reply.ids; - batch.each(function (id) { - console.log(id); - const elem = $("RROW-" + id); - if (elem) elem.removeClassName("Unread"); - catchup_id_batch.remove(id); - }); - - updateFloatingTitle(true); + batch.each(function (id) { + console.log(id); + const elem = $("RROW-" + id); + if (elem) elem.removeClassName("Unread"); + catchup_id_batch.remove(id); + }); + } - } + updateFloatingTitle(true); }); } } @@ -1322,125 +1213,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; } @@ -1477,43 +1259,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); @@ -1887,31 +1663,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"]); + } + } + }); + } }); } @@ -1920,6 +1690,7 @@ function setSelectionScore() { } } +/* function updateScore(id) { const pic = $$("#RROW-" + id + " .hlScorePic")[0]; @@ -1942,7 +1713,7 @@ function updateScore(id) { } }); } -} +} */ function changeScore(id, pic) { const score = pic.getAttribute("score"); @@ -1950,38 +1721,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); - - new Ajax.Request("backend.php", { - parameters: query, - onComplete: function (transport) { - const reply = JSON.parse(transport.responseText); + const query = { op: "rpc", method: "getlinktitlebyid", id: id }; - 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) {