X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=js%2Fviewfeed.js;h=347c38938d1dbc84d36a7d1f2407d4905d3251c4;hb=1702ecf7ea7f80fd7295c01cab3502c47cb72b45;hp=0e451166fded6c8dfec2420506baa729aad0d6e6;hpb=9dc5524df1a91252eee3247d2b8b2549df79150f;p=tt-rss.git diff --git a/js/viewfeed.js b/js/viewfeed.js index 0e451166..347c3893 100755 --- a/js/viewfeed.js +++ b/js/viewfeed.js @@ -5,12 +5,12 @@ 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; +//let catchup_timeout_id = false; -let cids_requested = []; +//let cids_requested = []; let loaded_article_ids = []; let _last_headlines_update = 0; let _headlines_scroll_offset = 0; @@ -22,41 +22,25 @@ 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); + if (background) + return; + let is_cat = false; let feed_id = false; - let reply = false; - - try { - reply = JSON.parse(transport.responseText); - } catch (e) { - console.error(e); - } - if (reply) { is_cat = reply['headlines']['is_cat']; 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,31 +77,23 @@ 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); while (tmp.hasChildNodes()) { var row = tmp.removeChild(tmp.firstChild); - if (loaded_article_ids.indexOf(row.id) == -1 || row.hasClassName("cdmFeedTitle")) { + if (loaded_article_ids.indexOf(row.id) == -1 || row.hasClassName("feed-title")) { dijit.byId("headlines-frame").domNode.appendChild(row); loaded_article_ids.push(row.id); } } - var hsp = $("headlines-spacer"); + let hsp = $("headlines-spacer"); if (!hsp) hsp = new Element("DIV", {"id": "headlines-spacer"}); dijit.byId('headlines-frame').domNode.appendChild(hsp); @@ -135,83 +110,69 @@ function headlines_callback2(transport, offset, background, infscroll_req) { } } else if (headlines_count > 0 && feed_id == getActiveFeedId() && is_cat == activeFeedIsCat()) { - console.log("adding some more headlines: " + headlines_count); + console.log("adding some more headlines: " + headlines_count); - const c = dijit.byId("headlines-frame"); - const ids = getSelectedArticleIds2(); + const c = dijit.byId("headlines-frame"); + //const ids = getSelectedArticleIds2(); - var hsp = $("headlines-spacer"); + let hsp = $("headlines-spacer"); - if (hsp) - c.domNode.removeChild(hsp); + if (hsp) + c.domNode.removeChild(hsp); - var tmp = new Element("div"); - tmp.innerHTML = reply['headlines']['content']; - dojo.parser.parse(tmp); + let tmp = document.createElement("div"); + tmp.innerHTML = reply['headlines']['content']; + dojo.parser.parse(tmp); - while (tmp.hasChildNodes()) { - var row = tmp.removeChild(tmp.firstChild); + while (tmp.hasChildNodes()) { + let row = tmp.removeChild(tmp.firstChild); - if (loaded_article_ids.indexOf(row.id) == -1 || row.hasClassName("cdmFeedTitle")) { - dijit.byId("headlines-frame").domNode.appendChild(row); + if (loaded_article_ids.indexOf(row.id) == -1 || row.hasClassName("feed-title")) { + dijit.byId("headlines-frame").domNode.appendChild(row); - loaded_article_ids.push(row.id); - } + loaded_article_ids.push(row.id); } + } - if (!hsp) hsp = new Element("DIV", {"id": "headlines-spacer"}); - c.domNode.appendChild(hsp); - - if (headlines_count < 30) _infscroll_disable = true; + if (!hsp) hsp = new Element("DIV", {"id": "headlines-spacer"}); + c.domNode.appendChild(hsp); - console.log("restore selected ids: " + ids); + if (headlines_count < 30) _infscroll_disable = true; - for (var i = 0; i < ids.length; i++) { - markHeadline(ids[i]); - } + /* console.log("restore selected ids: " + ids); - initHeadlinesMenu(); + for (let i = 0; i < ids.length; i++) { + markHeadline(ids[i]); + } */ - if (_infscroll_disable) { - hsp.innerHTML = "" + - __("Click to open next unread feed.") + ""; - } + initHeadlinesMenu(); - } else { - console.log("no new headlines received"); + if (_infscroll_disable) { + hsp.innerHTML = "" + + __("Click to open next unread feed.") + ""; + } - const first_id_changed = reply['headlines']['first_id_changed']; - console.log("first id changed:" + first_id_changed); + } else { + console.log("no new headlines received"); - var hsp = $("headlines-spacer"); + const first_id_changed = reply['headlines']['first_id_changed']; + console.log("first id changed:" + first_id_changed); - if (hsp) { - if (first_id_changed) { - hsp.innerHTML = "" + - __("New articles found, reload feed to continue.") + ""; - } else { - hsp.innerHTML = "" + - __("Click to open next unread feed.") + ""; - } + let hsp = $("headlines-spacer"); + if (hsp) { + if (first_id_changed) { + hsp.innerHTML = "" + + __("New articles found, reload feed to continue.") + ""; + } else { + hsp.innerHTML = "" + + __("Click to open next unread feed.") + ""; } } - if (articles) { - for (var i = 0; i < articles.length; i++) { - const a_id = articles[i]['id']; - cache_set("article:" + a_id, articles[i]['content']); - } - } else { - console.log("no cached articles received"); } - if (counters) - parse_counters(counters); - else - request_counters(); - } else { console.error("Invalid object received: " + transport.responseText); dijit.byId("headlines-frame").attr('content', "
" + @@ -259,6 +220,7 @@ function render_article(article) { } catch (e) { } } +/* function showArticleInHeadlines(id, noexpand) { const row = $("RROW-" + id); if (!row) return; @@ -276,15 +238,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 +251,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,14 +258,72 @@ 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(""); } +*/ +function view(id, noexpand) { + setActiveArticleId(id); + + if (!noexpand) { + console.log("loading article", id); + + const neighbor_ids = getRelativePostIds(id); + const cids = []; + + /* only request uncached articles */ + + neighbor_ids.each((n) => { + if (!cache_get("article:" + n)) + cids.push(n); + }); + + const cached_article = cache_get("article:" + id); + + if (cached_article) { + console.log('rendering cached', id); + render_article(cached_article); + return false; + } + + xhrPost("backend.php", {op: "article", method: "view", id: id, cids: cids.toString()}, (transport) => { + try { + const reply = handle_rpc_json(transport); + + if (reply) { -function view(id, activefeed, noexpand) { - const oldrow = $("RROW-" + getActiveArticleId()); + reply.each(function(article) { + if (getActiveArticleId() == article['id']) { + render_article(article['content']); + } + //cids_requested.remove(article['id']); + + cache_set("article:" + article['id'], article['content']); + }); + + } else { + console.error("Invalid object received: " + transport.responseText); + + render_article("
" + + __('Could not display article (invalid object received - see error console for details)') + "
"); + } + + //const unread_in_buffer = $$("#headlines-frame > div[id*=RROW][class*=Unread]").length; + //request_counters(unread_in_buffer == 0); + + notify(""); + + } catch (e) { + exception_error(e); + } + }) + } + + return false; + +/* const oldrow = $("RROW-" + getActiveArticleId()); if (oldrow) oldrow.removeClassName("active"); const crow = $("RROW-" + id); @@ -334,13 +341,13 @@ 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); /* only request uncached articles */ - const cids_to_request = []; +/* const cids_to_request = []; for (let i = 0; i < neighbor_ids.length; i++) { if (cids_requested.indexOf(neighbor_ids[i]) == -1) @@ -352,7 +359,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 +367,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 +388,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 +406,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 +423,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 +454,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 +462,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 +483,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) { @@ -533,8 +526,8 @@ function moveToPost(mode, noscroll, noexpand) { if (next_id || getActiveArticleId()) { if (isCdmMode()) { - var article = $("RROW-" + getActiveArticleId()); - var ctr = $("headlines-frame"); + const article = $("RROW-" + getActiveArticleId()); + const ctr = $("headlines-frame"); if (!noscroll && article && article.offsetTop + article.offsetHeight > ctr.scrollTop + ctr.offsetHeight) { @@ -542,13 +535,13 @@ function moveToPost(mode, noscroll, noexpand) { scrollArticle(ctr.offsetHeight/4); } else if (next_id) { - cdmExpandArticle(next_id, noexpand); cdmScrollToArticleId(next_id, true); + setActiveArticleId(next_id); } } else if (next_id) { correctHeadlinesOffset(next_id); - view(next_id, getActiveFeedId(), noexpand); + view(next_id, noexpand); } } } @@ -557,39 +550,30 @@ function moveToPost(mode, noscroll, noexpand) { if (prev_id || getActiveArticleId()) { if (isCdmMode()) { - var article = $("RROW-" + getActiveArticleId()); + const article = $("RROW-" + getActiveArticleId()); 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); - } + const ctr = $("headlines-frame"); + + 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); + setActiveArticleId(prev_id); + } } else if (prev_id) { correctHeadlinesOffset(prev_id); - view(prev_id, getActiveFeedId(), noexpand); + view(prev_id, noexpand); } } } } -function toggleSelected(id, force_on) { +/* function toggleSelected(id, force_on) { const row = $("RROW-" + id); if (row) { @@ -606,7 +590,7 @@ function toggleSelected(id, force_on) { } updateSelectedPrompt(); -} +} */ function updateSelectedPrompt() { const count = getSelectedArticleIds2().length; @@ -624,8 +608,9 @@ function updateSelectedPrompt() { } -function toggleUnread(id, cmode, effect) { +function toggleUnread(id, cmode) { const row = $("RROW-" + id); + if (row) { const tmpClassName = row.className; @@ -638,29 +623,21 @@ function toggleUnread(id, cmode, effect) { } } else if (cmode == 0) { - row.removeClassName("Unread"); - } else if (cmode == 1) { 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) { - handle_rpc_json(transport); - } + xhrPost("backend.php", query, (transport) => { + handle_rpc_json(transport); }); } - } } @@ -672,18 +649,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 +666,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 +718,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 +745,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 +769,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); + }); } } @@ -829,6 +788,11 @@ function getSelectedArticleIds2() { rv.push(child.getAttribute("data-article-id")); }); + // i wonder if this is a good idea: consider active article a honorary member + // of selected articles + if (getActiveArticleId()) + rv.push(getActiveArticleId()); + return rv; } @@ -848,13 +812,68 @@ function getLoadedArticleIds() { } // mode = all,none,unread,invert,marked,published -function selectArticles(mode, query) { +function selectArticles(mode) { + let query = "#headlines-frame > div[id*=RROW]"; + + switch (mode) { + case "none": + case "all": + case "invert": + break; + case "marked": + query += "[class*=marked]"; + break; + case "published": + query += "[class*=published]"; + break; + case "unread": + query += "[class*=Unread]"; + break; + default: + console.warn("selectArticles: unknown mode", mode); + } + + const rows = $$(query); + + for (let i = 0; i < rows.length; i++) { + const row = rows[i]; + const cb = dijit.getEnclosingWidget(row.select(".rchk")[0]); + + switch (mode) { + case "none": + row.removeClassName("Selected"); + + if (!row.hasClassName("active")) + cb.attr("checked", false); + break; + case "invert": + if (row.hasClassName("Selected")) { + row.removeClassName("Selected"); + + if (!row.hasClassName("active")) + cb.attr("checked", false); + } else { + row.addClassName("Selected"); + cb.attr("checked", true); + } + break; + default: + row.addClassName("Selected"); + cb.attr("checked", true); + } + + updateSelectedPrompt(); + } +} + +// mode = all,none,unread,invert,marked,published +/* function selectArticles(mode, query) { if (!query) query = "#headlines-frame > div[id*=RROW]"; 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]); @@ -903,7 +922,7 @@ function selectArticles(mode, query) { }); updateSelectedPrompt(); -} +} */ function deleteSelection() { @@ -930,16 +949,11 @@ 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(); }); } @@ -974,21 +988,16 @@ function archiveSelection() { return; } - const query = "?op=rpc&method="+op+"&ids=" + param_escape(rows); - - console.log(query); - 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,9 +1039,7 @@ function editArticleTags(id) { notify_progress("Saving article tags...", true); - new Ajax.Request("backend.php", { - parameters: query, - onComplete: function(transport) { + xhrPost("backend.php", this.attr('value'), (transport) => { try { notify(''); dialog.hide(); @@ -1042,8 +1049,6 @@ function editArticleTags(id) { if (data) { const id = data.id; - console.log(id); - const tags = $("ATSTR-" + id); const tooltip = dijit.byId("ATSTRTIP-" + id); @@ -1053,8 +1058,7 @@ function editArticleTags(id) { } catch (e) { exception_error(e); } - - }}); + }); } }, href: query @@ -1083,14 +1087,49 @@ function cdmScrollToArticleId(id, force) { // expanded cdm has a 4px margin now ctr.scrollTop = parseInt(e.offsetTop) - 4; + + /*setActiveArticleId(id); + + // article is selected manually, set it read + toggleUnread(id, 0); */ } } +// for the time being active article does not affect buffer selection (we still re/set the checkbox +// because of getSelectedArticleIds2() hack function setActiveArticleId(id) { - console.log("setActiveArticleId:" + id); + console.log("setActiveArticleId", id); + + $$("div[id*=RROW][class*=active]").each((e) => { + e.removeClassName("active"); + + if (!e.hasClassName("Selected")) { + const cb = dijit.getEnclosingWidget(e.select(".rchk")[0]); + if (cb) cb.attr("checked", false); + } + }) _active_article_id = id; - PluginHost.run(PluginHost.HOOK_ARTICLE_SET_ACTIVE, _active_article_id); + + const row = $("RROW-" + id); + + if (row) { + if (row.hasClassName("Unread")) { + toggleUnread(id, 0); + + decrementFeedCounter(getActiveFeedId(), activeFeedIsCat()); + updateFloatingTitle(true); + } + + row.addClassName("active"); + + if (!row.hasClassName("Selected")) { + const cb = dijit.getEnclosingWidget(row.select(".rchk")[0]); + if (cb) cb.attr("checked", true); + } + + PluginHost.run(PluginHost.HOOK_ARTICLE_SET_ACTIVE, _active_article_id); + } } function getActiveArticleId() { @@ -1106,26 +1145,30 @@ 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]"); + const threshold = $("headlines-frame").scrollTop + $("headlines-frame").offsetHeight + 300; - 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 <= threshold) { + console.log("unpacking: " + row.id); - child.innerHTML = htmlspecialchars_decode(child.innerHTML); - child.removeAttribute('id'); + row.select(".content-inner")[0].innerHTML = row.getAttribute("data-content"); + row.removeAttribute("data-content"); - PluginHost.run(PluginHost.HOOK_ARTICLE_RENDERED_CDM, row); + PluginHost.run(PluginHost.HOOK_ARTICLE_RENDERED_CDM, row); - Element.show(child); - } + // i wonder if this is a good idea? + if (!getActiveArticleId() && !row.hasClassName("Unread")) + setActiveArticleId(row.getAttribute("data-article-id")); + + } else { + break; } - ); + } } function headlines_scroll_handler(e) { @@ -1138,38 +1181,39 @@ 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")) { + if (isCdmMode() && getInitParam("cdm_auto_catchup") == 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") != getActiveArticleId()) { - if (_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(); + updateSelectedPrompt(); */ + + setActiveArticleId(row.getAttribute("data-article-id")); + break; } } } if (!_infscroll_disable) { + const hsp = $("headlines-spacer"); + if (hsp && hsp.offsetTop - 250 <= e.scrollTop + e.offsetHeight) { hsp.innerHTML = " " + @@ -1185,33 +1229,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; - - $$("#headlines-frame > div[id*=RROW][class*=Unread]").each( - function(child) { - if ($("headlines-frame").scrollTop > (child.offsetTop + child.offsetHeight/2)) { + let rows = $$("#headlines-frame > div[id*=RROW][class*=Unread]"); - const id = child.getAttribute("data-article-id") + for (let i = 0; i < rows.length; i++) { + const row = rows[i]; + + if ($("headlines-frame").scrollTop > (row.offsetTop + row.offsetHeight/2)) { - if (catchup_id_batch.indexOf(id) == -1) - catchup_id_batch.push(id); + const id = row.getAttribute("data-article-id") - //console.log("auto_catchup_batch: " + catchup_id_batch.toString()); - } + if (catchup_id_batch.indexOf(id) == -1) + catchup_id_batch.push(id); - }); + //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"); @@ -1236,37 +1278,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); + 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); + 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); - } + + updateFloatingTitle(true); }); } } @@ -1285,9 +1321,9 @@ function catchupRelativeToArticle(below, id) { const ids_to_mark = []; if (!below) { - for (var i = 0; i < visible_ids.length; i++) { + for (let i = 0; i < visible_ids.length; i++) { if (visible_ids[i] != id) { - var e = $("RROW-" + visible_ids[i]); + const e = $("RROW-" + visible_ids[i]); if (e && e.hasClassName("Unread")) { ids_to_mark.push(visible_ids[i]); @@ -1297,9 +1333,9 @@ function catchupRelativeToArticle(below, id) { } } } else { - for (var i = visible_ids.length - 1; i >= 0; i--) { + for (let i = visible_ids.length - 1; i >= 0; i--) { if (visible_ids[i] != id) { - var e = $("RROW-" + visible_ids[i]); + const e = $("RROW-" + visible_ids[i]); if (e && e.hasClassName("Unread")) { ids_to_mark.push(visible_ids[i]); @@ -1322,123 +1358,14 @@ 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() { @@ -1473,47 +1400,47 @@ function show_labels_in_headlines(transport) { } function cdmClicked(event, id, in_body) { - //var shift_key = event.shiftKey; + if (event.ctrlKey && !in_body || !in_body) { + openArticleInNewWindow(id); + } - if (!event.ctrlKey && !event.metaKey) { + setActiveArticleId(id); - if (!getInitParam("cdm_expanded")) { - return cdmExpandArticle(id); - } else { + //var shift_key = event.shiftKey; - let elem = $("RROW-" + getActiveArticleId()); + /* if (!event.ctrlKey && !event.metaKey) { - if (elem) elem.removeClassName("active"); + let elem = $("RROW-" + getActiveArticleId()); - selectArticles("none"); - toggleSelected(id); + if (elem) elem.removeClassName("active"); - elem = $("RROW-" + id); - const article_is_unread = elem.hasClassName("Unread"); + selectArticles("none"); + toggleSelected(id); - elem.removeClassName("Unread"); - elem.addClassName("active"); + elem = $("RROW-" + id); + const article_is_unread = elem.hasClassName("Unread"); - setActiveArticleId(id); + elem.removeClassName("Unread"); + elem.addClassName("active"); - if (article_is_unread) { - decrementFeedCounter(getActiveFeedId(), activeFeedIsCat()); - updateFloatingTitle(true); - } + setActiveArticleId(id); - const query = "?op=rpc&method=catchupSelected" + - "&cmode=0&ids=" + param_escape(id); + if (article_is_unread) { + decrementFeedCounter(getActiveFeedId(), activeFeedIsCat()); + updateFloatingTitle(true); - new Ajax.Request("backend.php", { - parameters: query, - onComplete: function (transport) { - handle_rpc_json(transport); - } - }); + const query = { + op: "rpc", method: "catchupSelected", + cmode: 0, ids: id + }; - return !event.shiftKey; + xhrPost("backend.php", query, (transport) => { + handle_rpc_json(transport); + }); } + return !event.shiftKey; + } else if (!in_body) { toggleSelected(id, true); @@ -1533,13 +1460,22 @@ function cdmClicked(event, id, in_body) { } const unread_in_buffer = $$("#headlines-frame > div[id*=RROW][class*=Unread]").length - request_counters(unread_in_buffer == 0); + request_counters(unread_in_buffer == 0); */ return false; } function hlClicked(event, id) { - if (event.which == 2) { + if (event.ctrlKey) { + openArticleInNewWindow(id); + setActiveArticleId(id); + } else { + view(id); + } + + return false; + + /* if (event.which == 2) { view(id); return true; } else if (event.ctrlKey || event.metaKey) { @@ -1548,12 +1484,10 @@ function hlClicked(event, id) { } else { view(id); return false; - } + } */ } function openArticleInNewWindow(id) { - toggleUnread(id, 0, false); - const w = window.open(""); w.opener = null; w.location = "backend.php?op=article&method=redirect&id=" + id; @@ -1563,7 +1497,7 @@ function isCdmMode() { return getInitParam("combined_display_mode"); } -function markHeadline(id, marked) { +/* function markHeadline(id, marked) { if (marked == undefined) marked = true; const row = $("RROW-" + id); @@ -1580,7 +1514,7 @@ function markHeadline(id, marked) { else row.removeClassName("Selected"); } -} +} */ function getRelativePostIds(id, limit) { @@ -1604,7 +1538,6 @@ function getRelativePostIds(id, limit) { } function correctHeadlinesOffset(id) { - const container = $("headlines-frame"); const row = $("RROW-" + id); @@ -1621,10 +1554,6 @@ function correctHeadlinesOffset(id) { if (rel_offset_top <= 0 || rel_offset_top > viewport) { container.scrollTop = row.offsetTop; } else if (rel_offset_bottom > viewport) { - - /* doesn't properly work with Opera in some cases because - Opera fucks up element scrolling */ - container.scrollTop = row.offsetTop + row.offsetHeight - viewport; } } @@ -1635,7 +1564,6 @@ function headlineActionsChange(elem) { } function closeArticlePanel() { - if (dijit.byId("content-insert")) dijit.byId("headlines-wrap-inner").removeChild( dijit.byId("content-insert")); @@ -1887,30 +1815,24 @@ 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("score-pic")[0]; + + if (pic) { + pic.src = pic.src.replace(/score_.*?\.png/, + reply["score_pic"]); + pic.setAttribute("score", reply["score"]); } - }); - } + } + }); } }); } @@ -1920,70 +1842,36 @@ function setSelectionScore() { } } -function updateScore(id) { - const pic = $$("#RROW-" + id + " .hlScorePic")[0]; - - if (pic) { - - const query = "op=article&method=getScore&id=" + param_escape(id); - - new Ajax.Request("backend.php", { - parameters: query, - onComplete: function (transport) { - console.log(transport.responseText); - - const 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"]); - } - } - }); - } -} - function changeScore(id, pic) { const score = pic.getAttribute("score"); const new_score = prompt(__("Please enter new score for this article:"), score); if (new_score != undefined) { + const query = { op: "article", method: "setScore", id: id, score: new_score }; - 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); - } + 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); } }); + } +// floatingTitle goto button uses this function scrollToRowId(id) { const row = $(id); @@ -1995,7 +1883,6 @@ function updateFloatingTitle(unread_only) { if (!isCdmMode()) return; const hf = $("headlines-frame"); - const elems = $$("#headlines-frame > div[id*=RROW]"); for (let i = 0; i < elems.length; i++) { @@ -2004,7 +1891,7 @@ function updateFloatingTitle(unread_only) { if (child && child.offsetTop + child.offsetHeight > hf.scrollTop) { - const header = child.getElementsByClassName("cdmHeader")[0]; + const header = child.select(".header")[0]; if (unread_only || child.getAttribute("data-article-id") != $("floatingTitle").getAttribute("data-article-id")) { if (child.getAttribute("data-article-id") != $("floatingTitle").getAttribute("data-article-id")) { @@ -2041,14 +1928,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(); - } - } -}