X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=js%2Fviewfeed.js;h=95e55050d9ce4b2441eba0036e2f6caa26267e7b;hb=e2b8c9273e09091c235959c25d8e4d8122aa6ca8;hp=007728a1004ca64c319e5f5e60d440b3b846b54c;hpb=fa287f6b116564f46aa20ee7da1a9d8aed311b97;p=tt-rss.git diff --git a/js/viewfeed.js b/js/viewfeed.js index 007728a1..95e55050 100755 --- a/js/viewfeed.js +++ b/js/viewfeed.js @@ -1,931 +1,805 @@ -var article_cache = new Array(); +/* global dijit, __ */ -var _active_article_id = 0; +let _active_article_id = 0; -var vgroup_last_feed = false; -var post_under_pointer = false; +let vgroup_last_feed = false; +let post_under_pointer = false; -var last_requested_article = false; +let last_requested_article = 0; -var catchup_id_batch = []; -var catchup_timeout_id = false; +let catchup_id_batch = []; +//let catchup_timeout_id = false; -var cids_requested = []; -var loaded_article_ids = []; -var _last_headlines_update = 0; -var _headlines_scroll_offset = 0; -var current_first_id = 0; +//let cids_requested = []; +let loaded_article_ids = []; +let _last_headlines_update = 0; +let _headlines_scroll_offset = 0; +let current_first_id = 0; +let last_search_query; -var _catchup_request_sent = false; +let _catchup_request_sent = false; -var has_storage = 'sessionStorage' in window && window['sessionStorage'] !== null; +let has_storage = 'sessionStorage' in window && window['sessionStorage'] !== null; function headlines_callback2(transport, offset, background, infscroll_req) { - try { - handle_rpc_json(transport); + const reply = handle_rpc_json(transport); - console.log("headlines_callback2 [offset=" + offset + "] B:" + background + " I:" + infscroll_req); + console.log("headlines_callback2 [offset=" + offset + "] B:" + background + " I:" + infscroll_req); - var is_cat = false; - var feed_id = false; + if (background) + return; - var reply = false; + let is_cat = false; + let feed_id = false; - try { - reply = JSON.parse(transport.responseText); - } catch (e) { - console.error(e); - } + if (reply) { - if (reply) { + is_cat = reply['headlines']['is_cat']; + feed_id = reply['headlines']['id']; + last_search_query = reply['headlines']['search_query']; - is_cat = reply['headlines']['is_cat']; - feed_id = reply['headlines']['id']; + if (feed_id != -7 && (feed_id != getActiveFeedId() || is_cat != activeFeedIsCat())) + return; - if (background) { - var content = reply['headlines']['content']; + try { + if (infscroll_req == false) { + $("headlines-frame").scrollTop = 0; - content = content + "
"; - return; + $("floatingTitle").style.visibility = "hidden"; + $("floatingTitle").setAttribute("data-article-id", 0); + $("floatingTitle").innerHTML = ""; } + } catch (e) { } - 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; - - $("floatingTitle").style.visibility = "hidden"; - $("floatingTitle").setAttribute("data-article-id", 0); - $("floatingTitle").innerHTML = ""; - } - } catch (e) { }; - - $("headlines-frame").removeClassName("cdm"); - $("headlines-frame").removeClassName("normal"); + $("headlines-frame").removeClassName("cdm"); + $("headlines-frame").removeClassName("normal"); - $("headlines-frame").addClassName(isCdmMode() ? "cdm" : "normal"); + $("headlines-frame").addClassName(isCdmMode() ? "cdm" : "normal"); - var headlines_count = reply['headlines-info']['count']; + const headlines_count = reply['headlines-info']['count']; - vgroup_last_feed = reply['headlines-info']['vgroup_last_feed']; + vgroup_last_feed = reply['headlines-info']['vgroup_last_feed']; - if (parseInt(headlines_count) < 30) { - _infscroll_disable = 1; - } else { - _infscroll_disable = 0; - } - - current_first_id = reply['headlines']['first_id']; - var counters = reply['counters']; - var articles = reply['articles']; - //var runtime_info = reply['runtime-info']; + if (parseInt(headlines_count) < 30) { + _infscroll_disable = 1; + } else { + _infscroll_disable = 0; + } - if (infscroll_req == false) { - loaded_article_ids = []; + current_first_id = reply['headlines']['first_id']; + const counters = reply['counters']; + const articles = reply['articles']; - dojo.html.set($("headlines-toolbar"), - reply['headlines']['toolbar'], - {parseContent: true}); + if (infscroll_req == false) { + loaded_article_ids = []; - /*dojo.html.set($("headlines-frame"), - reply['headlines']['content'], + dojo.html.set($("headlines-toolbar"), + reply['headlines']['toolbar'], {parseContent: true}); - $$("#headlines-frame div[id*='RROW']").each(function(row) { - loaded_article_ids.push(row.id); - });*/ - - $("headlines-frame").innerHTML = ''; + $("headlines-frame").innerHTML = ''; - 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()) { + var 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); } + } - var hsp = $("headlines-spacer"); - if (!hsp) hsp = new Element("DIV", {"id": "headlines-spacer"}); - dijit.byId('headlines-frame').domNode.appendChild(hsp); - - initHeadlinesMenu(); - - if (_infscroll_disable) - hsp.innerHTML = "" + - __("Click to open next unread feed.") + ""; - - if (_search_query) { - $("feed_title").innerHTML += "" + - " (" + __("Cancel search") + ")" + - ""; - } + let hsp = $("headlines-spacer"); + if (!hsp) hsp = new Element("DIV", {"id": "headlines-spacer"}); + dijit.byId('headlines-frame').domNode.appendChild(hsp); - } else { + initHeadlinesMenu(); - if (headlines_count > 0 && feed_id == getActiveFeedId() && is_cat == activeFeedIsCat()) { - console.log("adding some more headlines: " + headlines_count); + if (_infscroll_disable) + hsp.innerHTML = "" + + __("Click to open next unread feed.") + ""; - var c = dijit.byId("headlines-frame"); - var ids = getSelectedArticleIds2(); + if (_search_query) { + $("feed_title").innerHTML += "" + + " (" + __("Cancel search") + ")" + + ""; + } - var hsp = $("headlines-spacer"); + } else if (headlines_count > 0 && feed_id == getActiveFeedId() && is_cat == activeFeedIsCat()) { + console.log("adding some more headlines: " + headlines_count); - if (hsp) - c.domNode.removeChild(hsp); + const c = dijit.byId("headlines-frame"); + //const ids = getSelectedArticleIds2(); - var tmp = new Element("div"); - tmp.innerHTML = reply['headlines']['content']; - dojo.parser.parse(tmp); + let hsp = $("headlines-spacer"); - while (tmp.hasChildNodes()) { - var row = tmp.removeChild(tmp.firstChild); + if (hsp) + c.domNode.removeChild(hsp); - if (loaded_article_ids.indexOf(row.id) == -1 || row.hasClassName("cdmFeedTitle")) { - dijit.byId("headlines-frame").domNode.appendChild(row); + let tmp = document.createElement("div"); + tmp.innerHTML = reply['headlines']['content']; + dojo.parser.parse(tmp); - loaded_article_ids.push(row.id); - } - } + while (tmp.hasChildNodes()) { + let row = tmp.removeChild(tmp.firstChild); - if (!hsp) hsp = new Element("DIV", {"id": "headlines-spacer"}); - c.domNode.appendChild(hsp); + if (loaded_article_ids.indexOf(row.id) == -1 || row.hasClassName("feed-title")) { + dijit.byId("headlines-frame").domNode.appendChild(row); - if (headlines_count < 30) _infscroll_disable = true; + loaded_article_ids.push(row.id); + } + } - console.log("restore selected ids: " + ids); + if (!hsp) hsp = new Element("DIV", {"id": "headlines-spacer"}); + c.domNode.appendChild(hsp); - for (var i = 0; i < ids.length; i++) { - markHeadline(ids[i]); - } + if (headlines_count < 30) _infscroll_disable = true; - initHeadlinesMenu(); + /* console.log("restore selected ids: " + ids); - if (_infscroll_disable) { - hsp.innerHTML = "" + - __("Click to open next unread feed.") + ""; - } + for (let i = 0; i < ids.length; i++) { + markHeadline(ids[i]); + } */ - } else { - console.log("no new headlines received"); + initHeadlinesMenu(); - var first_id_changed = reply['headlines']['first_id_changed']; - console.log("first id changed:" + first_id_changed); + if (_infscroll_disable) { + hsp.innerHTML = "" + + __("Click to open next unread feed.") + ""; + } - var hsp = $("headlines-spacer"); + } else { + console.log("no new headlines received"); - if (hsp) { - if (first_id_changed) { - hsp.innerHTML = "" + - __("New articles found, reload feed to continue.") + ""; - } else { - 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); - } + 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++) { - var 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(true); - - } else { - console.error("Invalid object received: " + transport.responseText); - dijit.byId("headlines-frame").attr('content', "
" + - __('Could not update headlines (invalid object received - see error console for details)') + - "
"); } - _infscroll_request_sent = 0; - _last_headlines_update = new Date().getTime(); - - unpackVisibleHeadlines(); + } else { + console.error("Invalid object received: " + transport.responseText); + dijit.byId("headlines-frame").attr('content', "
" + + __('Could not update headlines (invalid object received - see error console for details)') + + "
"); + } - // if we have some more space in the buffer, why not try to fill it + _infscroll_request_sent = 0; + _last_headlines_update = new Date().getTime(); - if (!_infscroll_disable && $("headlines-spacer") && - $("headlines-spacer").offsetTop < $("headlines-frame").offsetHeight) { + unpackVisibleHeadlines(); - window.setTimeout(function() { - loadMoreHeadlines(); - }, 250); - } + // if we have some more space in the buffer, why not try to fill it - notify(""); + if (!_infscroll_disable && $("headlines-spacer") && + $("headlines-spacer").offsetTop < $("headlines-frame").offsetHeight) { - } catch (e) { - exception_error("headlines_callback2", e, transport); + window.setTimeout(function() { + loadMoreHeadlines(); + }, 250); } + + notify(""); } function render_article(article) { - try { - cleanup_memory("content-insert"); - - dijit.byId("headlines-wrap-inner").addChild( - dijit.byId("content-insert")); + cleanup_memory("content-insert"); - var c = dijit.byId("content-insert"); + dijit.byId("headlines-wrap-inner").addChild( + dijit.byId("content-insert")); - try { - c.domNode.scrollTop = 0; - } catch (e) { }; + const c = dijit.byId("content-insert"); - c.attr('content', article); - PluginHost.run(PluginHost.HOOK_ARTICLE_RENDERED, c.domNode); + try { + c.domNode.scrollTop = 0; + } catch (e) { } - correctHeadlinesOffset(getActiveArticleId()); + c.attr('content', article); + PluginHost.run(PluginHost.HOOK_ARTICLE_RENDERED, c.domNode); - try { - c.focus(); - } catch (e) { }; + correctHeadlinesOffset(getActiveArticleId()); - } catch (e) { - exception_error("render_article", e); - } + try { + c.focus(); + } catch (e) { } } +/* function showArticleInHeadlines(id, noexpand) { + const row = $("RROW-" + id); + if (!row) return; - try { - var row = $("RROW-" + id); - if (!row) return; - - if (!noexpand) - row.removeClassName("Unread"); - - row.addClassName("active"); + if (!noexpand) + row.removeClassName("Unread"); - selectArticles('none'); + row.addClassName("active"); - markHeadline(id); + selectArticles('none'); - } catch (e) { - exception_error("showArticleInHeadlines", e); - } + markHeadline(id); } function article_callback2(transport, id) { - try { - console.log("article_callback2 " + id); + console.log("article_callback2 " + id); - handle_rpc_json(transport); + const reply = handle_rpc_json(transport); - var reply = false; + if (reply) { - try { - reply = JSON.parse(transport.responseText); - } catch (e) { - console.error(e); - } + reply.each(function(article) { + if (getActiveArticleId() == article['id']) { + render_article(article['content']); + } + cids_requested.remove(article['id']); - if (reply) { + cache_set("article:" + article['id'], article['content']); + }); - reply.each(function(article) { - if (getActiveArticleId() == article['id']) { - render_article(article['content']); - } - cids_requested.remove(article['id']); + } else { + console.error("Invalid object received: " + transport.responseText); - cache_set("article:" + article['id'], article['content']); - }); + render_article("
" + + __('Could not display article (invalid object received - see error console for details)') + "
"); + } -// if (id != last_requested_article) { -// console.log("requested article id is out of sequence, aborting"); -// return; -// } + const unread_in_buffer = $$("#headlines-frame > div[id*=RROW][class*=Unread]").length; + request_counters(unread_in_buffer == 0); - } else { - console.error("Invalid object received: " + transport.responseText); + notify(""); +} +*/ +function view(id, noexpand) { + setActiveArticleId(id); - render_article("
" + - __('Could not display article (invalid object received - see error console for details)') + "
"); - } + if (!noexpand) { + console.log("loading article", id); - var unread_in_buffer = $$("#headlines-frame > div[id*=RROW][class*=Unread]").length - request_counters(unread_in_buffer == 0); + const neighbor_ids = getRelativePostIds(id); + const cids = []; - notify(""); - } catch (e) { - exception_error("article_callback2", e, transport); - } -} + /* only request uncached articles */ -function view(id, activefeed, noexpand) { - try { - var oldrow = $("RROW-" + getActiveArticleId()); - if (oldrow) oldrow.removeClassName("active"); + neighbor_ids.each((n) => { + if (!cache_get("article:" + n)) + cids.push(n); + }); - var crow = $("RROW-" + id); + const cached_article = cache_get("article:" + id); - if (!crow) return; - if (noexpand) { - setActiveArticleId(id); - showArticleInHeadlines(id, noexpand); - return; + if (cached_article) { + console.log('rendering cached', id); + render_article(cached_article); + return false; } - console.log("loading article: " + id); + xhrPost("backend.php", {op: "article", method: "view", id: id, cids: cids.toString()}, (transport) => { + try { + const reply = handle_rpc_json(transport); + + if (reply) { - var cached_article = cache_get("article:" + id); + reply.each(function(article) { + if (getActiveArticleId() == article['id']) { + render_article(article['content']); + } + //cids_requested.remove(article['id']); - console.log("cache check result: " + (cached_article != false)); + cache_set("article:" + article['id'], article['content']); + }); - var query = "?op=article&method=view&id=" + param_escape(id); + } else { + console.error("Invalid object received: " + transport.responseText); - var neighbor_ids = getRelativePostIds(id); + render_article("
" + + __('Could not display article (invalid object received - see error console for details)') + "
"); + } - /* only request uncached articles */ + //const unread_in_buffer = $$("#headlines-frame > div[id*=RROW][class*=Unread]").length; + //request_counters(unread_in_buffer == 0); - var cids_to_request = []; + notify(""); - for (var i = 0; i < neighbor_ids.length; i++) { - if (cids_requested.indexOf(neighbor_ids[i]) == -1) - if (!cache_get("article:" + neighbor_ids[i])) { - cids_to_request.push(neighbor_ids[i]); - cids_requested.push(neighbor_ids[i]); - } - } + } catch (e) { + exception_error(e); + } + }) + } - console.log("additional ids: " + cids_to_request.toString()); + return false; - query = query + "&cids=" + cids_to_request.toString(); +/* const oldrow = $("RROW-" + getActiveArticleId()); + if (oldrow) oldrow.removeClassName("active"); - var article_is_unread = crow.hasClassName("Unread"); + const crow = $("RROW-" + id); + if (!crow) return; + if (noexpand) { setActiveArticleId(id); - showArticleInHeadlines(id); + showArticleInHeadlines(id, noexpand); + return; + } - if (cached_article && article_is_unread) { + console.log("loading article: " + id); - query = query + "&mode=prefetch"; + const cached_article = cache_get("article:" + id); - render_article(cached_article); + console.log("cache check result: " + (cached_article != false)); - } else if (cached_article) { + const query = {op: "article", method: "view", id: id}; - query = query + "&mode=prefetch_old"; - render_article(cached_article); + const neighbor_ids = getRelativePostIds(id); - // if we don't need to request any relative ids, we might as well skip - // the server roundtrip altogether - if (cids_to_request.length == 0) { - return; + /* only request uncached articles */ + +/* const cids_to_request = []; + + for (let i = 0; i < neighbor_ids.length; i++) { + if (cids_requested.indexOf(neighbor_ids[i]) == -1) + if (!cache_get("article:" + neighbor_ids[i])) { + cids_to_request.push(neighbor_ids[i]); + cids_requested.push(neighbor_ids[i]); } - } + } - last_requested_article = id; + console.log("additional ids: " + cids_to_request.toString()); - console.log(query); + query.cids = cids_to_request.toString(); - if (article_is_unread) { - decrementFeedCounter(getActiveFeedId(), activeFeedIsCat()); + const article_is_unread = crow.hasClassName("Unread"); + + setActiveArticleId(id); + showArticleInHeadlines(id); + + if (cached_article && article_is_unread) { + query.mode = "prefetch"; + render_article(cached_article); + } else if (cached_article) { + query.mode = "prefetch_old"; + render_article(cached_article); + + // if we don't need to request any relative ids, we might as well skip + // the server roundtrip altogether + if (cids_to_request.length == 0) { + return; } + } - new Ajax.Request("backend.php", { - parameters: query, - onComplete: function(transport) { - article_callback2(transport, id); - } }); + last_requested_article = id; - return false; + console.log(query); - } catch (e) { - exception_error("view", e); + if (article_is_unread) { + decrementFeedCounter(getActiveFeedId(), activeFeedIsCat()); } + + xhrPost("backend.php", query, (transport) => { + article_callback2(transport, id); + }) + + return false; +*/ } function toggleMark(id, client_only) { - try { - var query = "?op=rpc&id=" + id + "&method=mark"; + const query = { op: "rpc", id: id, method: "mark" }; - var row = $("RROW-" + id); - if (!row) return; + const row = $("RROW-" + id); + if (!row) return; - var imgs = []; + const imgs = []; - var row_imgs = row.getElementsByClassName("markedPic"); + const row_imgs = row.getElementsByClassName("markedPic"); - for (var i = 0; i < row_imgs.length; i++) - imgs.push(row_imgs[i]); + for (let i = 0; i < row_imgs.length; i++) + imgs.push(row_imgs[i]); - var ft = $("floatingTitle"); + const ft = $("floatingTitle"); - if (ft && ft.getAttribute("data-article-id") == id) { - var fte = ft.getElementsByClassName("markedPic"); + if (ft && ft.getAttribute("data-article-id") == id) { + const fte = ft.getElementsByClassName("markedPic"); - for (var i = 0; i < fte.length; i++) - imgs.push(fte[i]); - } + for (var i = 0; i < fte.length; i++) + imgs.push(fte[i]); + } - for (i = 0; i < imgs.length; i++) { - var img = imgs[i]; + for (i = 0; i < imgs.length; i++) { + const img = imgs[i]; - if (!row.hasClassName("marked")) { - img.src = img.src.replace("mark_unset", "mark_set"); - img.alt = __("Unstar article"); - query = query + "&mark=1"; - } else { - img.src = img.src.replace("mark_set", "mark_unset"); - img.alt = __("Star article"); - query = query + "&mark=0"; - } + if (!row.hasClassName("marked")) { + img.src = img.src.replace("mark_unset", "mark_set"); + query.mark = 1; + } else { + img.src = img.src.replace("mark_set", "mark_unset"); + query.mark = 0; } + } - row.toggleClassName("marked"); - - if (!client_only) { - new Ajax.Request("backend.php", { - parameters: query, - onComplete: function(transport) { - handle_rpc_json(transport); - } }); - } + row.toggleClassName("marked"); - } catch (e) { - exception_error("toggleMark", e); + if (!client_only) + xhrPost("backend.php", query, (transport) => { + handle_rpc_json(transport); + }); } -} function togglePub(id, client_only, no_effects, note) { - try { - var query = "?op=rpc&id=" + id + "&method=publ"; + const query = { op: "rpc", id: id, method: "publ" }; - if (note != undefined) { - query = query + "¬e=" + param_escape(note); - } else { - query = query + "¬e=undefined"; - } + if (note != undefined) { + query.note = note; + } else { + query.note = "undefined"; + } - var row = $("RROW-" + id); - if (!row) return; + const row = $("RROW-" + id); + if (!row) return; - var imgs = []; + const imgs = []; - var row_imgs = row.getElementsByClassName("pubPic"); + const row_imgs = row.getElementsByClassName("pubPic"); - for (var i = 0; i < row_imgs.length; i++) - imgs.push(row_imgs[i]); + for (let i = 0; i < row_imgs.length; i++) + imgs.push(row_imgs[i]); - var ft = $("floatingTitle"); + const ft = $("floatingTitle"); - if (ft && ft.getAttribute("data-article-id") == id) { - var fte = ft.getElementsByClassName("pubPic"); + if (ft && ft.getAttribute("data-article-id") == id) { + const fte = ft.getElementsByClassName("pubPic"); - for (var i = 0; i < fte.length; i++) - imgs.push(fte[i]); - } + for (let i = 0; i < fte.length; i++) + imgs.push(fte[i]); + } - for (i = 0; i < imgs.length; i++) { - var img = imgs[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"); - img.alt = __("Unpublish article"); - query = query + "&pub=1"; - } else { - img.src = img.src.replace("pub_set", "pub_unset"); - img.alt = __("Publish article"); - query = query + "&pub=0"; - } + if (!row.hasClassName("published") || note != undefined) { + img.src = img.src.replace("pub_unset", "pub_set"); + query.pub = 1; + } else { + img.src = img.src.replace("pub_set", "pub_unset"); + query.pub = 0; } + } - if (note != undefined) - row.addClassName("published"); - else - row.toggleClassName("published"); - - if (!client_only) { - new Ajax.Request("backend.php", { - parameters: query, - onComplete: function(transport) { - handle_rpc_json(transport); - } }); - } + if (note != undefined) + row.addClassName("published"); + else + row.toggleClassName("published"); - } catch (e) { - exception_error("togglePub", e); - } + if (!client_only) + xhrPost("backend.php", query, (transport) => { + handle_rpc_json(transport); + }); } function moveToPost(mode, noscroll, noexpand) { + const rows = getLoadedArticleIds(); - try { - - var rows = getLoadedArticleIds(); + let prev_id = false; + let next_id = false; - var prev_id = false; - var next_id = false; - - if (!$('RROW-' + getActiveArticleId())) { - setActiveArticleId(0); - } + if (!$('RROW-' + getActiveArticleId())) { + setActiveArticleId(0); + } - if (!getActiveArticleId()) { - next_id = rows[0]; - prev_id = rows[rows.length-1] - } else { - for (var i = 0; i < rows.length; i++) { - if (rows[i] == getActiveArticleId()) { + if (!getActiveArticleId()) { + next_id = rows[0]; + prev_id = rows[rows.length-1] + } else { + for (let i = 0; i < rows.length; i++) { + if (rows[i] == getActiveArticleId()) { - // Account for adjacent identical article ids. - if (i > 0) prev_id = rows[i-1]; + // Account for adjacent identical article ids. + if (i > 0) prev_id = rows[i-1]; - for (var j = i+1; j < rows.length; j++) { - if (rows[j] != getActiveArticleId()) { - next_id = rows[j]; - break; - } + for (let j = i+1; j < rows.length; j++) { + if (rows[j] != getActiveArticleId()) { + next_id = rows[j]; + break; } - break; } + break; } } + } - console.log("cur: " + getActiveArticleId() + " next: " + next_id); - - if (mode == "next") { - if (next_id || getActiveArticleId()) { - if (isCdmMode()) { + console.log("cur: " + getActiveArticleId() + " next: " + next_id); - var article = $("RROW-" + getActiveArticleId()); - var ctr = $("headlines-frame"); + if (mode == "next") { + if (next_id || getActiveArticleId()) { + if (isCdmMode()) { - if (!noscroll && article && article.offsetTop + article.offsetHeight > - ctr.scrollTop + ctr.offsetHeight) { + const article = $("RROW-" + getActiveArticleId()); + const ctr = $("headlines-frame"); - scrollArticle(ctr.offsetHeight/4); + if (!noscroll && article && article.offsetTop + article.offsetHeight > + ctr.scrollTop + ctr.offsetHeight) { - } else if (next_id) { - cdmExpandArticle(next_id, noexpand); - cdmScrollToArticleId(next_id, true); - } + scrollArticle(ctr.offsetHeight/4); } else if (next_id) { - correctHeadlinesOffset(next_id); - view(next_id, getActiveFeedId(), noexpand); + cdmScrollToArticleId(next_id, true); + setActiveArticleId(next_id); } + + } else if (next_id) { + correctHeadlinesOffset(next_id); + view(next_id, noexpand); } } + } - if (mode == "prev") { - if (prev_id || getActiveArticleId()) { - if (isCdmMode()) { - - var article = $("RROW-" + getActiveArticleId()); - var prev_article = $("RROW-" + prev_id); - var ctr = $("headlines-frame"); - - if (!getInitParam("cdm_expanded")) { + if (mode == "prev") { + if (prev_id || getActiveArticleId()) { + if (isCdmMode()) { - 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 article = $("RROW-" + getActiveArticleId()); + const prev_article = $("RROW-" + prev_id); + 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) { - correctHeadlinesOffset(prev_id); - view(prev_id, getActiveFeedId(), noexpand); + cdmScrollToArticleId(prev_id, noscroll); + setActiveArticleId(prev_id); } + + } else if (prev_id) { + correctHeadlinesOffset(prev_id); + view(prev_id, noexpand); } } - - } catch (e) { - exception_error("moveToPost", e); } + } -function toggleSelected(id, force_on) { - try { - var row = $("RROW-" + id); +/* function toggleSelected(id, force_on) { + const row = $("RROW-" + id); - if (row) { - var cb = dijit.getEnclosingWidget( - row.getElementsByClassName("rchk")[0]); + if (row) { + const cb = dijit.getEnclosingWidget( + row.getElementsByClassName("rchk")[0]); - if (row.hasClassName('Selected') && !force_on) { - row.removeClassName('Selected'); - if (cb) cb.attr("checked", false); - } else { - row.addClassName('Selected'); - if (cb) cb.attr("checked", true); - } + if (row.hasClassName('Selected') && !force_on) { + row.removeClassName('Selected'); + if (cb) cb.attr("checked", false); + } else { + row.addClassName('Selected'); + if (cb) cb.attr("checked", true); } - - updateSelectedPrompt(); - } catch (e) { - exception_error("toggleSelected", e); } -} -function updateSelectedPrompt() { - try { - var count = getSelectedArticleIds2().size(); - var elem = $("selected_prompt"); + updateSelectedPrompt(); +} */ - if (elem) { - elem.innerHTML = ngettext("%d article selected", - "%d articles selected", count).replace("%d", count); +function updateSelectedPrompt() { + const count = getSelectedArticleIds2().length; + const elem = $("selected_prompt"); - if (count > 0) - Element.show(elem); - else - Element.hide(elem); - } + if (elem) { + elem.innerHTML = ngettext("%d article selected", + "%d articles selected", count).replace("%d", count); - } catch (e) { - exception_error("updateSelectedPrompt", e); + if (count > 0) + Element.show(elem); + else + Element.hide(elem); } -} - -function toggleUnread(id, cmode, effect) { - try { - - var row = $("RROW-" + id); - if (row) { - var tmpClassName = row.className; - if (cmode == undefined || cmode == 2) { - if (row.hasClassName("Unread")) { - row.removeClassName("Unread"); +} - } else { - row.addClassName("Unread"); - } +function toggleUnread(id, cmode) { + const row = $("RROW-" + id); - } else if (cmode == 0) { + if (row) { + const tmpClassName = row.className; + if (cmode == undefined || cmode == 2) { + if (row.hasClassName("Unread")) { row.removeClassName("Unread"); - } else if (cmode == 1) { + } else { row.addClassName("Unread"); } - if (cmode == undefined) cmode = 2; - - var query = "?op=rpc&method=catchupSelected" + - "&cmode=" + param_escape(cmode) + "&ids=" + param_escape(id); + } else if (cmode == 0) { + row.removeClassName("Unread"); + } else if (cmode == 1) { + row.addClassName("Unread"); + } -// notify_progress("Loading, please wait..."); + if (tmpClassName != row.className) { + if (cmode == undefined) cmode = 2; - if (tmpClassName != row.className) { - new Ajax.Request("backend.php", { - parameters: query, - onComplete: function (transport) { - handle_rpc_json(transport); - } - }); - } + const query = {op: "rpc", method: "catchupSelected", + cmode: cmode, ids: id}; + xhrPost("backend.php", query, (transport) => { + handle_rpc_json(transport); + }); } - - } catch (e) { - exception_error("toggleUnread", e); } } function selectionRemoveLabel(id, ids) { - try { - - if (!ids) ids = getSelectedArticleIds2(); - - if (ids.length == 0) { - alert(__("No articles are selected.")); - return; - } - - var query = "?op=article&method=removeFromLabel&ids=" + - param_escape(ids.toString()) + "&lid=" + param_escape(id); - - console.log(query); + if (!ids) ids = getSelectedArticleIds2(); - new Ajax.Request("backend.php", { - parameters: query, - onComplete: function(transport) { - handle_rpc_json(transport); - show_labels_in_headlines(transport); - } }); + if (ids.length == 0) { + alert(__("No articles are selected.")); + return; + } - } catch (e) { - exception_error("selectionAssignLabel", e); + 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) { - try { - - if (!ids) ids = getSelectedArticleIds2(); - - if (ids.length == 0) { - alert(__("No articles are selected.")); - return; - } - - var query = "?op=article&method=assignToLabel&ids=" + - param_escape(ids.toString()) + "&lid=" + param_escape(id); + if (!ids) ids = getSelectedArticleIds2(); - console.log(query); - - new Ajax.Request("backend.php", { - parameters: query, - onComplete: function(transport) { - handle_rpc_json(transport); - show_labels_in_headlines(transport); - } }); + if (ids.length == 0) { + alert(__("No articles are selected.")); + return; + } - } catch (e) { - exception_error("selectionAssignLabel", e); + const query = { op: "article", method: "assignToLabel", + ids: ids.toString(), lid: id }; - } + xhrPost("backend.php", query, (transport) => { + handle_rpc_json(transport); + show_labels_in_headlines(transport); + }); } function selectionToggleUnread(set_state, callback, no_error, ids) { - try { - var rows = ids ? ids : getSelectedArticleIds2(); + const rows = ids ? ids : getSelectedArticleIds2(); - if (rows.length == 0 && !no_error) { - alert(__("No articles are selected.")); - return; - } - - for (var i = 0; i < rows.length; i++) { - var row = $("RROW-" + rows[i]); - if (row) { - if (set_state == undefined) { - if (row.hasClassName("Unread")) { - row.removeClassName("Unread"); - } else { - row.addClassName("Unread"); - } - } + if (rows.length == 0 && !no_error) { + alert(__("No articles are selected.")); + return; + } - if (set_state == false) { + for (let i = 0; i < rows.length; i++) { + const row = $("RROW-" + rows[i]); + if (row) { + if (set_state == undefined) { + if (row.hasClassName("Unread")) { row.removeClassName("Unread"); - } - - if (set_state == true) { + } else { row.addClassName("Unread"); } } - } - - updateFloatingTitle(true); - if (rows.length > 0) { - - var cmode = ""; + if (set_state == false) { + row.removeClassName("Unread"); + } - if (set_state == undefined) { - cmode = "2"; - } else if (set_state == true) { - cmode = "1"; - } else if (set_state == false) { - cmode = "0"; + if (set_state == true) { + row.addClassName("Unread"); } + } + } - var query = "?op=rpc&method=catchupSelected" + - "&cmode=" + cmode + "&ids=" + param_escape(rows.toString()); + updateFloatingTitle(true); - notify_progress("Loading, please wait..."); + if (rows.length > 0) { - new Ajax.Request("backend.php", { - parameters: query, - onComplete: function(transport) { - handle_rpc_json(transport); - if (callback) callback(transport); - } }); + let cmode = ""; + if (set_state == undefined) { + cmode = "2"; + } else if (set_state == true) { + cmode = "1"; + } else if (set_state == false) { + cmode = "0"; } - } catch (e) { - exception_error("selectionToggleUnread", e); + const query = {op: "rpc", method: "catchupSelected", + cmode: cmode, ids: rows.toString() }; + + notify_progress("Loading, please wait..."); + + xhrPost("backend.php", query, (transport) => { + handle_rpc_json(transport); + if (callback) callback(transport); + }); + } } // sel_state ignored function selectionToggleMarked(sel_state, callback, no_error, ids) { - try { + const rows = ids ? ids : getSelectedArticleIds2(); - var rows = ids ? ids : getSelectedArticleIds2(); - - if (rows.length == 0 && !no_error) { - alert(__("No articles are selected.")); - return; - } - - for (var i = 0; i < rows.length; i++) { - toggleMark(rows[i], true, true); - } - - if (rows.length > 0) { - - var query = "?op=rpc&method=markSelected&ids=" + - param_escape(rows.toString()) + "&cmode=2"; + if (rows.length == 0 && !no_error) { + alert(__("No articles are selected.")); + return; + } - new Ajax.Request("backend.php", { - parameters: query, - onComplete: function(transport) { - handle_rpc_json(transport); - if (callback) callback(transport); - } }); + for (let i = 0; i < rows.length; i++) { + toggleMark(rows[i], true, true); + } - } + if (rows.length > 0) { + const query = { op: "rpc", method: "markSelected", + ids: rows.toString(), cmode: 2 }; - } catch (e) { - exception_error("selectionToggleMarked", e); + xhrPost("backend.php", query, (transport) => { + handle_rpc_json(transport); + if (callback) callback(transport); + }); } } // sel_state ignored function selectionTogglePublished(sel_state, callback, no_error, ids) { - try { - - var rows = ids ? ids : getSelectedArticleIds2(); - - if (rows.length == 0 && !no_error) { - alert(__("No articles are selected.")); - return; - } - - for (var i = 0; i < rows.length; i++) { - togglePub(rows[i], true, true); - } - - if (rows.length > 0) { + const rows = ids ? ids : getSelectedArticleIds2(); - var query = "?op=rpc&method=publishSelected&ids=" + - param_escape(rows.toString()) + "&cmode=2"; + if (rows.length == 0 && !no_error) { + alert(__("No articles are selected.")); + return; + } - new Ajax.Request("backend.php", { - parameters: query, - onComplete: function(transport) { - handle_rpc_json(transport); - } }); + for (let i = 0; i < rows.length; i++) { + togglePub(rows[i], true, true); + } - } + if (rows.length > 0) { + const query = { op: "rpc", method: "publishSelected", + ids: rows.toString(), cmode: 2 }; - } catch (e) { - exception_error("selectionToggleMarked", e); + xhrPost("backend.php", query, (transport) => { + handle_rpc_json(transport); + if (callback) callback(transport); + }); } } function getSelectedArticleIds2() { - var rv = []; + const rv = []; $$("#headlines-frame > div[id*=RROW][class*=Selected]").each( function(child) { 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; } function getLoadedArticleIds() { - var rv = []; + const rv = []; - var children = $$("#headlines-frame > div[id*=RROW-]"); + const children = $$("#headlines-frame > div[id*=RROW-]"); children.each(function(child) { if (Element.visible(child)) { @@ -938,276 +812,324 @@ function getLoadedArticleIds() { } // mode = all,none,unread,invert,marked,published -function selectArticles(mode, query) { - try { - - if (!query) query = "#headlines-frame > div[id*=RROW]"; +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); + } - var children = $$(query); + const rows = $$(query); - children.each(function(child) { - var id = child.getAttribute("data-article-id"); + for (let i = 0; i < rows.length; i++) { + const row = rows[i]; + const cb = dijit.getEnclosingWidget(row.select(".rchk")[0]); - var cb = dijit.getEnclosingWidget( - child.getElementsByClassName("rchk")[0]); + switch (mode) { + case "none": + row.removeClassName("Selected"); - if (mode == "all") { - child.addClassName("Selected"); - if (cb) cb.attr("checked", true); - } else if (mode == "unread") { - if (child.hasClassName("Unread")) { - child.addClassName("Selected"); - if (cb) cb.attr("checked", true); - } else { - child.removeClassName("Selected"); - if (cb) cb.attr("checked", false); - } - } else if (mode == "marked") { - if (child.hasClassName("marked")) { - child.addClassName("Selected"); - if (cb) cb.attr("checked", true); - } else { - child.removeClassName("Selected"); - if (cb) cb.attr("checked", false); - } - } else if (mode == "published") { - if (child.hasClassName("published")) { - child.addClassName("Selected"); - if (cb) cb.attr("checked", true); - } else { - child.removeClassName("Selected"); - if (cb) cb.attr("checked", false); - } + if (!row.hasClassName("active")) + cb.attr("checked", false); + break; + case "invert": + if (row.hasClassName("Selected")) { + row.removeClassName("Selected"); - } else if (mode == "invert") { - if (child.hasClassName("Selected")) { - child.removeClassName("Selected"); - if (cb) cb.attr("checked", false); + if (!row.hasClassName("active")) + cb.attr("checked", false); } else { - child.addClassName("Selected"); - if (cb) cb.attr("checked", true); + row.addClassName("Selected"); + cb.attr("checked", true); } - - } else { - child.removeClassName("Selected"); - if (cb) cb.attr("checked", false); - } - }); + break; + default: + row.addClassName("Selected"); + cb.attr("checked", true); + } updateSelectedPrompt(); - - } catch (e) { - exception_error("selectArticles", e); } } -function deleteSelection() { - - try { +// mode = all,none,unread,invert,marked,published +/* function selectArticles(mode, query) { + if (!query) query = "#headlines-frame > div[id*=RROW]"; - var rows = getSelectedArticleIds2(); + const children = $$(query); - if (rows.length == 0) { - alert(__("No articles are selected.")); - return; - } + children.each(function(child) { + //const id = child.getAttribute("data-article-id"); - var fn = getFeedName(getActiveFeedId(), activeFeedIsCat()); - var str; + const cb = dijit.getEnclosingWidget( + child.getElementsByClassName("rchk")[0]); - if (getActiveFeedId() != 0) { - str = ngettext("Delete %d selected article in %s?", "Delete %d selected articles in %s?" , rows.length); - } else { - str = ngettext("Delete %d selected article?", "Delete %d selected articles?", rows.length); - } + if (mode == "all") { + child.addClassName("Selected"); + if (cb) cb.attr("checked", true); + } else if (mode == "unread") { + if (child.hasClassName("Unread")) { + child.addClassName("Selected"); + if (cb) cb.attr("checked", true); + } else { + child.removeClassName("Selected"); + if (cb) cb.attr("checked", false); + } + } else if (mode == "marked") { + if (child.hasClassName("marked")) { + child.addClassName("Selected"); + if (cb) cb.attr("checked", true); + } else { + child.removeClassName("Selected"); + if (cb) cb.attr("checked", false); + } + } else if (mode == "published") { + if (child.hasClassName("published")) { + child.addClassName("Selected"); + if (cb) cb.attr("checked", true); + } else { + child.removeClassName("Selected"); + if (cb) cb.attr("checked", false); + } - str = str.replace("%d", rows.length); - str = str.replace("%s", fn); + } else if (mode == "invert") { + if (child.hasClassName("Selected")) { + child.removeClassName("Selected"); + if (cb) cb.attr("checked", false); + } else { + child.addClassName("Selected"); + if (cb) cb.attr("checked", true); + } - if (getInitParam("confirm_feed_catchup") == 1 && !confirm(str)) { - return; + } else { + child.removeClassName("Selected"); + if (cb) cb.attr("checked", false); } + }); - query = "?op=rpc&method=delete&ids=" + param_escape(rows); + updateSelectedPrompt(); +} */ - console.log(query); +function deleteSelection() { - new Ajax.Request("backend.php", { - parameters: query, - onComplete: function(transport) { - handle_rpc_json(transport); - viewCurrentFeed(); - } }); + const rows = getSelectedArticleIds2(); - } catch (e) { - exception_error("deleteSelection", e); + if (rows.length == 0) { + alert(__("No articles are selected.")); + return; } -} -function archiveSelection() { + const fn = getFeedName(getActiveFeedId(), activeFeedIsCat()); + let str; - try { + if (getActiveFeedId() != 0) { + str = ngettext("Delete %d selected article in %s?", "Delete %d selected articles in %s?", rows.length); + } else { + str = ngettext("Delete %d selected article?", "Delete %d selected articles?", rows.length); + } - var rows = getSelectedArticleIds2(); + str = str.replace("%d", rows.length); + str = str.replace("%s", fn); - if (rows.length == 0) { - alert(__("No articles are selected.")); - return; - } + if (getInitParam("confirm_feed_catchup") == 1 && !confirm(str)) { + return; + } - var fn = getFeedName(getActiveFeedId(), activeFeedIsCat()); - var str; - var op; + const query = { op: "rpc", method: "delete", ids: rows.toString() }; - 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); + xhrPost("backend.php", query, (transport) => { + handle_rpc_json(transport); + viewCurrentFeed(); + }); +} - str += " " + __("Please note that unstarred articles might get purged on next feed update."); +function archiveSelection() { - op = "unarchive"; - } + const rows = getSelectedArticleIds2(); - str = str.replace("%d", rows.length); - str = str.replace("%s", fn); + if (rows.length == 0) { + alert(__("No articles are selected.")); + return; + } - if (getInitParam("confirm_feed_catchup") == 1 && !confirm(str)) { - return; - } + const fn = getFeedName(getActiveFeedId(), activeFeedIsCat()); + let str; + let op; - query = "?op=rpc&method="+op+"&ids=" + param_escape(rows); + 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); - console.log(query); + str += " " + __("Please note that unstarred articles might get purged on next feed update."); - for (var i = 0; i < rows.length; i++) { - cache_delete("article:" + rows[i]); - } + op = "unarchive"; + } - new Ajax.Request("backend.php", { - parameters: query, - onComplete: function(transport) { - handle_rpc_json(transport); - viewCurrentFeed(); - } }); + str = str.replace("%d", rows.length); + str = str.replace("%s", fn); - } catch (e) { - exception_error("archiveSelection", e); + if (getInitParam("confirm_feed_catchup") == 1 && !confirm(str)) { + return; } -} -function catchupSelection() { + for (let i = 0; i < rows.length; i++) { + cache_delete("article:" + rows[i]); + } - try { + const query = {op: "rpc", method: op, ids: rows.toString()}; - var rows = getSelectedArticleIds2(); + xhrPost("backend.php", query, (transport) => { + handle_rpc_json(transport); + viewCurrentFeed(); + }); +} - if (rows.length == 0) { - alert(__("No articles are selected.")); - return; - } +function catchupSelection() { - var fn = getFeedName(getActiveFeedId(), activeFeedIsCat()); + const rows = getSelectedArticleIds2(); - var str = ngettext("Mark %d selected article in %s as read?", "Mark %d selected articles in %s as read?", rows.length); + if (rows.length == 0) { + alert(__("No articles are selected.")); + return; + } - str = str.replace("%d", rows.length); - str = str.replace("%s", fn); + const fn = getFeedName(getActiveFeedId(), activeFeedIsCat()); - if (getInitParam("confirm_feed_catchup") == 1 && !confirm(str)) { - return; - } + let str = ngettext("Mark %d selected article in %s as read?", "Mark %d selected articles in %s as read?", rows.length); - selectionToggleUnread(false, 'viewCurrentFeed()', true); + str = str.replace("%d", rows.length); + str = str.replace("%s", fn); - } catch (e) { - exception_error("catchupSelection", e); + if (getInitParam("confirm_feed_catchup") == 1 && !confirm(str)) { + return; } + + selectionToggleUnread(false, 'viewCurrentFeed()', true); } function editArticleTags(id) { - var query = "backend.php?op=article&method=editArticleTags¶m=" + param_escape(id); + const query = "backend.php?op=article&method=editArticleTags¶m=" + param_escape(id); - if (dijit.byId("editTagsDlg")) - dijit.byId("editTagsDlg").destroyRecursive(); + if (dijit.byId("editTagsDlg")) + dijit.byId("editTagsDlg").destroyRecursive(); - dialog = new dijit.Dialog({ - id: "editTagsDlg", - title: __("Edit article Tags"), - style: "width: 600px", - execute: function() { - if (this.validate()) { - var query = dojo.objectToQuery(this.attr('value')); + const dialog = new dijit.Dialog({ + id: "editTagsDlg", + title: __("Edit article Tags"), + style: "width: 600px", + execute: function() { + if (this.validate()) { + const query = dojo.objectToQuery(this.attr('value')); - notify_progress("Saving article tags...", true); + 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(); - var data = JSON.parse(transport.responseText); + const data = JSON.parse(transport.responseText); - if (data) { - var id = data.id; + if (data) { + const id = data.id; - console.log(id); + const tags = $("ATSTR-" + id); + const tooltip = dijit.byId("ATSTRTIP-" + id); - var tags = $("ATSTR-" + id); - var tooltip = dijit.byId("ATSTRTIP-" + id); - - if (tags) tags.innerHTML = data.content; - if (tooltip) tooltip.attr('label', data.content_full); - } - } catch (e) { - exception_error("editArticleTags/inner", e); + if (tags) tags.innerHTML = data.content; + if (tooltip) tooltip.attr('label', data.content_full); } + } catch (e) { + exception_error(e); + } + }); + } + }, + href: query + }); - }}); - } - }, - href: query - }); - - var tmph = dojo.connect(dialog, 'onLoad', function() { - dojo.disconnect(tmph); + var tmph = dojo.connect(dialog, 'onLoad', function() { + dojo.disconnect(tmph); - new Ajax.Autocompleter('tags_str', 'tags_choices', - "backend.php?op=article&method=completeTags", - { tokens: ',', paramName: "search" }); - }); + new Ajax.Autocompleter('tags_str', 'tags_choices', + "backend.php?op=article&method=completeTags", + { tokens: ',', paramName: "search" }); + }); - dialog.show(); + dialog.show(); } function cdmScrollToArticleId(id, force) { - try { - var ctr = $("headlines-frame"); - var e = $("RROW-" + id); + const ctr = $("headlines-frame"); + const e = $("RROW-" + id); - if (!e || !ctr) return; + if (!e || !ctr) return; - if (force || e.offsetTop+e.offsetHeight > (ctr.scrollTop+ctr.offsetHeight) || - e.offsetTop < ctr.scrollTop) { + if (force || e.offsetTop+e.offsetHeight > (ctr.scrollTop+ctr.offsetHeight) || + e.offsetTop < ctr.scrollTop) { - // expanded cdm has a 4px margin now - ctr.scrollTop = parseInt(e.offsetTop) - 4; - } + // expanded cdm has a 4px margin now + ctr.scrollTop = parseInt(e.offsetTop) - 4; - } catch (e) { - exception_error("cdmScrollToArticleId", e); + /*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() { @@ -1223,30 +1145,29 @@ function postMouseOut(id) { } function unpackVisibleHeadlines() { - try { - if (!isCdmMode() || !getInitParam("cdm_expanded")) return; + if (!isCdmMode()) return; - $$("#headlines-frame > div[id*=RROW]").each( - function(child) { - if (child.offsetTop <= $("headlines-frame").scrollTop + - $("headlines-frame").offsetHeight) { + const rows = $$("#headlines-frame div[id*=RROW][data-content]"); + const threshold = $("headlines-frame").scrollTop + $("headlines-frame").offsetHeight + 300; - var cencw = $("CENCW-" + child.getAttribute("data-article-id")); + for (let i = 0; i < rows.length; i++) { + const row = rows[i]; - if (cencw) { - cencw.innerHTML = htmlspecialchars_decode(cencw.innerHTML); - cencw.setAttribute('id', ''); + if (row.offsetTop <= threshold) { + console.log("unpacking: " + row.id); - PluginHost.run(PluginHost.HOOK_ARTICLE_RENDERED_CDM, child); + row.select(".content-inner")[0].innerHTML = row.getAttribute("data-content"); + row.removeAttribute("data-content"); - Element.show(cencw); - } - } - } - ); + PluginHost.run(PluginHost.HOOK_ARTICLE_RENDERED_CDM, row); - } catch (e) { - exception_error("unpackVisibleHeadlines", e); + // i wonder if this is a good idea? + if (!getActiveArticleId() && !row.hasClassName("Unread")) + setActiveArticleId(row.getAttribute("data-article-id")); + + } else { + break; + } } } @@ -1260,38 +1181,39 @@ function headlines_scroll_handler(e) { _headlines_scroll_offset = e.scrollTop; - var 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) { - var rows = $$("#headlines-frame > div[id*=RROW]"); + const rows = $$("#headlines-frame > div[id*=RROW]"); - for (var i = 0; i < rows.length; i++) { - var child = rows[i]; + for (let i = 0; i < rows.length; 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) { - var row = $("RROW-" + _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 = " " + @@ -1303,289 +1225,147 @@ function headlines_scroll_handler(e) { } } - if (isCdmMode()) { - updateFloatingTitle(); - } - - catchupCurrentBatchIfNeeded(); - - 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 > - (child.offsetTop + child.offsetHeight/2)) { - - var id = child.getAttribute("data-article-id") - - if (catchup_id_batch.indexOf(id) == -1) - catchup_id_batch.push(id); - - //console.log("auto_catchup_batch: " + catchup_id_batch.toString()); - } - - }); - - if (_infscroll_disable) { - var child = $$("#headlines-frame div[id*=RROW]").last(); - - if (child && $("headlines-frame").scrollTop > - (child.offsetTop + child.offsetHeight - 50)) { - - console.log("we seem to be at an end"); - - if (getInitParam("on_catchup_show_next_feed") == "1") { - openNextUnreadFeed(); - } - } - } - } - - } catch (e) { - console.warn("headlines_scroll_handler: " + e); - } -} - -function openNextUnreadFeed() { - try { - var is_cat = activeFeedIsCat(); - var nuf = getNextUnreadFeed(getActiveFeedId(), is_cat); - if (nuf) viewfeed({feed: nuf, is_cat: is_cat}); - } catch (e) { - exception_error("openNextUnreadFeed", e); - } -} - -function catchupBatchedArticles() { - try { - if (catchup_id_batch.length > 0 && !_infscroll_request_sent && !_catchup_request_sent) { - - console.log("catchupBatchedArticles: working"); - - // make a copy of the array - var batch = catchup_id_batch.slice(); - var query = "?op=rpc&method=catchupSelected" + - "&cmode=0&ids=" + param_escape(batch.toString()); - - console.log(query); - - _catchup_request_sent = true; - - new Ajax.Request("backend.php", { - parameters: query, - onComplete: function(transport) { - handle_rpc_json(transport); - - _catchup_request_sent = false; - - 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); - }); - - updateFloatingTitle(true); - - } }); - } - - } catch (e) { - exception_error("catchupBatchedArticles", e); - } -} - -function catchupRelativeToArticle(below, id) { - - try { - - if (!id) id = getActiveArticleId(); - - if (!id) { - alert(__("No article is selected.")); - return; - } - - var visible_ids = getLoadedArticleIds(); - - var ids_to_mark = new Array(); - - if (!below) { - for (var i = 0; i < visible_ids.length; i++) { - if (visible_ids[i] != id) { - var e = $("RROW-" + visible_ids[i]); - - if (e && e.hasClassName("Unread")) { - ids_to_mark.push(visible_ids[i]); - } - } else { - break; - } - } - } else { - for (var i = visible_ids.length-1; i >= 0; i--) { - if (visible_ids[i] != id) { - var e = $("RROW-" + visible_ids[i]); - - if (e && e.hasClassName("Unread")) { - ids_to_mark.push(visible_ids[i]); - } - } else { - break; - } - } - } - - if (ids_to_mark.length == 0) { - alert(__("No articles found to mark")); - } else { - var msg = ngettext("Mark %d article as read?", "Mark %d articles as read?", ids_to_mark.length).replace("%d", ids_to_mark.length); - - if (getInitParam("confirm_feed_catchup") != 1 || confirm(msg)) { - - for (var i = 0; i < ids_to_mark.length; i++) { - var e = $("RROW-" + ids_to_mark[i]); - e.removeClassName("Unread"); - } - - var query = "?op=rpc&method=catchupSelected" + - "&cmode=0" + "&ids=" + param_escape(ids_to_mark.toString()); - - new Ajax.Request("backend.php", { - parameters: query, - onComplete: function(transport) { - handle_rpc_json(transport); - } }); - - } - } - - } catch (e) { - exception_error("catchupRelativeToArticle", e); - } -} - -function cdmCollapseArticle(event, id, unmark) { - try { - if (unmark == undefined) unmark = true; + if (isCdmMode()) { + updateFloatingTitle(); + } - var row = $("RROW-" + id); - var elem = $("CICD-" + id); + if (getInitParam("cdm_auto_catchup") == 1) { - if (elem && row) { - var collapse = $$("div#RROW-" + id + - " span[class='collapseBtn']")[0]; + let rows = $$("#headlines-frame > div[id*=RROW][class*=Unread]"); - Element.hide(elem); - Element.show("CEXC-" + id); - Element.hide(collapse); + for (let i = 0; i < rows.length; i++) { + const row = rows[i]; + + if ($("headlines-frame").scrollTop > (row.offsetTop + row.offsetHeight/2)) { - if (unmark) { - row.removeClassName("active"); + const id = row.getAttribute("data-article-id") - markHeadline(id, false); + if (catchup_id_batch.indexOf(id) == -1) + catchup_id_batch.push(id); - if (id == getActiveArticleId()) { - setActiveArticleId(0); + //console.log("auto_catchup_batch: " + catchup_id_batch.toString()); + } else { + break; } - - updateSelectedPrompt(); } - if (event) Event.stop(event); + if (_infscroll_disable) { + const row = $$("#headlines-frame div[id*=RROW]").last(); - PluginHost.run(PluginHost.HOOK_ARTICLE_COLLAPSED, id); + if (row && $("headlines-frame").scrollTop > + (row.offsetTop + row.offsetHeight - 50)) { - if (row.offsetTop < $("headlines-frame").scrollTop) - scrollToRowId(row.id); + console.log("we seem to be at an end"); - $("floatingTitle").style.visibility = "hidden"; - $("floatingTitle").setAttribute("data-article-id", 0); + if (getInitParam("on_catchup_show_next_feed") == "1") { + openNextUnreadFeed(); + } + } + } } } catch (e) { - exception_error("cdmCollapseArticle", e); + console.warn("headlines_scroll_handler: " + e); } } -function cdmExpandArticle(id, noexpand) { - try { - console.log("cdmExpandArticle " + id); +function openNextUnreadFeed() { + const is_cat = activeFeedIsCat(); + const nuf = getNextUnreadFeed(getActiveFeedId(), is_cat); + if (nuf) viewfeed({feed: nuf, is_cat: is_cat}); +} - if (!$("RROW-" + id)) return false; +function catchupBatchedArticles() { + if (catchup_id_batch.length > 0 && !_infscroll_request_sent && !_catchup_request_sent) { - var oldrow = $("RROW-" + getActiveArticleId()); + console.log("catchupBatchedArticles, size=", catchup_id_batch.length); - var elem = $("CICD-" + getActiveArticleId()); + // make a copy of the array + const batch = catchup_id_batch.slice(); + const query = { op: "rpc", method: "catchupSelected", + cmode: 0, ids: batch.toString() }; - if (id == getActiveArticleId() && Element.visible(elem)) - return true; + _catchup_request_sent = true; - selectArticles("none"); + xhrPost("backend.php", query, (transport) => { + const reply = handle_rpc_json(transport); - var old_offset = $("RROW-" + id).offsetTop; + _catchup_request_sent = false; - if (getActiveArticleId() && elem && !getInitParam("cdm_expanded")) { - var collapse = $$("div#RROW-" + getActiveArticleId() + - " span[class='collapseBtn']")[0]; + if (reply) { + const batch = reply.ids; - Element.hide(elem); - Element.show("CEXC-" + getActiveArticleId()); - Element.hide(collapse); - } + batch.each(function (id) { + const elem = $("RROW-" + id); + if (elem) elem.removeClassName("Unread"); + catchup_id_batch.remove(id); + }); + } - if (oldrow) oldrow.removeClassName("active"); + updateFloatingTitle(true); + }); + } +} - setActiveArticleId(id); +function catchupRelativeToArticle(below, id) { - elem = $("CICD-" + id); + if (!id) id = getActiveArticleId(); - var collapse = $$("div#RROW-" + id + - " span[class='collapseBtn']")[0]; + if (!id) { + alert(__("No article is selected.")); + return; + } - var cencw = $("CENCW-" + id); + const visible_ids = getLoadedArticleIds(); - if (!Element.visible(elem) && !noexpand) { - if (cencw) { - cencw.innerHTML = htmlspecialchars_decode(cencw.innerHTML); - cencw.setAttribute('id', ''); - Element.show(cencw); - } + const ids_to_mark = []; - Element.show(elem); - Element.hide("CEXC-" + id); - Element.show(collapse); - } + if (!below) { + for (let i = 0; i < visible_ids.length; i++) { + if (visible_ids[i] != id) { + const e = $("RROW-" + visible_ids[i]); - var new_offset = $("RROW-" + id).offsetTop; + if (e && e.hasClassName("Unread")) { + ids_to_mark.push(visible_ids[i]); + } + } else { + break; + } + } + } else { + for (let i = visible_ids.length - 1; i >= 0; i--) { + if (visible_ids[i] != id) { + const e = $("RROW-" + visible_ids[i]); - if (old_offset > new_offset) - $("headlines-frame").scrollTop -= (old_offset-new_offset); + if (e && e.hasClassName("Unread")) { + ids_to_mark.push(visible_ids[i]); + } + } else { + break; + } + } + } - if (!noexpand) { - if (catchup_id_batch.indexOf(id) == -1) - catchup_id_batch.push(id); + if (ids_to_mark.length == 0) { + alert(__("No articles found to mark")); + } else { + const msg = ngettext("Mark %d article as read?", "Mark %d articles as read?", ids_to_mark.length).replace("%d", ids_to_mark.length); - catchupCurrentBatchIfNeeded(); - } + if (getInitParam("confirm_feed_catchup") != 1 || confirm(msg)) { - toggleSelected(id); - $("RROW-" + id).addClassName("active"); + for (var i = 0; i < ids_to_mark.length; i++) { + var e = $("RROW-" + ids_to_mark[i]); + e.removeClassName("Unread"); + } - PluginHost.run(PluginHost.HOOK_ARTICLE_EXPANDED, id); + const query = { op: "rpc", method: "catchupSelected", + cmode: 0, ids: ids_to_mark.toString() }; - } catch (e) { - exception_error("cdmExpandArticle", e); + xhrPost("backend.php", query, (transport) => { + handle_rpc_json(transport); + }); + } } - - return false; } function getArticleUnderPointer() { @@ -1593,143 +1373,136 @@ function getArticleUnderPointer() { } function scrollArticle(offset) { - try { - if (!isCdmMode()) { - var ci = $("content-insert"); - if (ci) { - ci.scrollTop += offset; - } - } else { - var hi = $("headlines-frame"); - if (hi) { - hi.scrollTop += offset; - } - + if (!isCdmMode()) { + const ci = $("content-insert"); + if (ci) { + ci.scrollTop += offset; } - } catch (e) { - exception_error("scrollArticle", e); + } else { + const hi = $("headlines-frame"); + if (hi) { + hi.scrollTop += offset; + } + } } function show_labels_in_headlines(transport) { - try { - var data = JSON.parse(transport.responseText); + const data = JSON.parse(transport.responseText); - if (data) { - data['info-for-headlines'].each(function(elem) { - $$(".HLLCTR-" + elem.id).each(function(ctr) { - ctr.innerHTML = elem.labels; - }); + if (data) { + data['info-for-headlines'].each(function (elem) { + $$(".HLLCTR-" + elem.id).each(function (ctr) { + ctr.innerHTML = elem.labels; }); - } - } catch (e) { - exception_error("show_labels_in_headlines", e); + }); } } -function cdmClicked(event, id) { - try { - //var shift_key = event.shiftKey; - - if (!event.ctrlKey && !event.metaKey) { +function cdmClicked(event, id, in_body) { + if (event.ctrlKey && !in_body) { + openArticleInNewWindow(id); + } - if (!getInitParam("cdm_expanded")) { - return cdmExpandArticle(id); - } else { + setActiveArticleId(id); - var elem = $("RROW-" + getActiveArticleId()); + //var shift_key = event.shiftKey; - if (elem) elem.removeClassName("active"); + /* if (!event.ctrlKey && !event.metaKey) { - selectArticles("none"); - toggleSelected(id); + let elem = $("RROW-" + getActiveArticleId()); - var elem = $("RROW-" + id); - var article_is_unread = elem.hasClassName("Unread"); + if (elem) elem.removeClassName("active"); - elem.removeClassName("Unread"); - elem.addClassName("active"); + selectArticles("none"); + toggleSelected(id); - setActiveArticleId(id); + elem = $("RROW-" + id); + const article_is_unread = elem.hasClassName("Unread"); - if (article_is_unread) { - decrementFeedCounter(getActiveFeedId(), activeFeedIsCat()); - updateFloatingTitle(true); - } + elem.removeClassName("Unread"); + elem.addClassName("active"); - var query = "?op=rpc&method=catchupSelected" + - "&cmode=0&ids=" + param_escape(id); + setActiveArticleId(id); - new Ajax.Request("backend.php", { - parameters: query, - onComplete: function(transport) { - handle_rpc_json(transport); - } }); + if (article_is_unread) { + decrementFeedCounter(getActiveFeedId(), activeFeedIsCat()); + updateFloatingTitle(true); - return !event.shiftKey; - } + const query = { + op: "rpc", method: "catchupSelected", + cmode: 0, ids: id + }; - } else if (event.target.parents(".cdmHeader").length > 0) { + xhrPost("backend.php", query, (transport) => { + handle_rpc_json(transport); + }); + } - toggleSelected(id, true); + return !event.shiftKey; - var elem = $("RROW-" + id); - var article_is_unread = elem.hasClassName("Unread"); + } else if (!in_body) { - if (article_is_unread) { - decrementFeedCounter(getActiveFeedId(), activeFeedIsCat()); - } + toggleSelected(id, true); - toggleUnread(id, 0, false); + let elem = $("RROW-" + id); + const article_is_unread = elem.hasClassName("Unread"); - openArticleInNewWindow(id); + if (article_is_unread) { + decrementFeedCounter(getActiveFeedId(), activeFeedIsCat()); } - var unread_in_buffer = $$("#headlines-frame > div[id*=RROW][class*=Unread]").length - request_counters(unread_in_buffer == 0); + toggleUnread(id, 0, false); - } catch (e) { - exception_error("cdmClicked"); + openArticleInNewWindow(id); + } else { + return true; } + const unread_in_buffer = $$("#headlines-frame > div[id*=RROW][class*=Unread]").length + request_counters(unread_in_buffer == 0); */ + return false; } function hlClicked(event, id) { - try { - if (event.which == 2) { - view(id); - return true; - } else if (event.ctrlKey || event.metaKey) { - toggleSelected(id, true); - toggleUnread(id, 0, false); - openArticleInNewWindow(id); - return false; - } else { - view(id); - return false; - } - - } catch (e) { - exception_error("hlClicked"); + 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) { + openArticleInNewWindow(id); + return false; + } else { + view(id); + return false; + } */ } function openArticleInNewWindow(id) { - toggleUnread(id, 0, false); - window.open("backend.php?op=article&method=redirect&id=" + id); + const w = window.open(""); + w.opener = null; + w.location = "backend.php?op=article&method=redirect&id=" + id; } function isCdmMode() { return getInitParam("combined_display_mode"); } -function markHeadline(id, marked) { +/* function markHeadline(id, marked) { if (marked == undefined) marked = true; - var row = $("RROW-" + id); + const row = $("RROW-" + id); if (row) { - var check = dijit.getEnclosingWidget( + const check = dijit.getEnclosingWidget( row.getElementsByClassName("rchk")[0]); if (check) { @@ -1741,353 +1514,265 @@ function markHeadline(id, marked) { else row.removeClassName("Selected"); } -} +} */ function getRelativePostIds(id, limit) { - var tmp = []; - - try { + const tmp = []; - if (!limit) limit = 6; //3 + if (!limit) limit = 6; //3 - var ids = getLoadedArticleIds(); + const ids = getLoadedArticleIds(); - for (var i = 0; i < ids.length; i++) { - if (ids[i] == id) { - for (var k = 1; k <= limit; k++) { - //if (i > k-1) tmp.push(ids[i-k]); - if (i < ids.length-k) tmp.push(ids[i+k]); - } - break; + for (let i = 0; i < ids.length; i++) { + if (ids[i] == id) { + for (let k = 1; k <= limit; k++) { + //if (i > k-1) tmp.push(ids[i-k]); + if (i < ids.length - k) tmp.push(ids[i + k]); } + break; } - - } catch (e) { - exception_error("getRelativePostIds", e); } return tmp; } function correctHeadlinesOffset(id) { + const container = $("headlines-frame"); + const row = $("RROW-" + id); - try { - - var container = $("headlines-frame"); - var row = $("RROW-" + id); - - if (!container || !row) return; + if (!container || !row) return; - var viewport = container.offsetHeight; + const viewport = container.offsetHeight; - var rel_offset_top = row.offsetTop - container.scrollTop; - var rel_offset_bottom = row.offsetTop + row.offsetHeight - container.scrollTop; + const rel_offset_top = row.offsetTop - container.scrollTop; + const rel_offset_bottom = row.offsetTop + row.offsetHeight - container.scrollTop; - //console.log("Rtop: " + rel_offset_top + " Rbtm: " + rel_offset_bottom); - //console.log("Vport: " + viewport); - - 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; - } + //console.log("Rtop: " + rel_offset_top + " Rbtm: " + rel_offset_bottom); + //console.log("Vport: " + viewport); - } catch (e) { - exception_error("correctHeadlinesOffset", e); + if (rel_offset_top <= 0 || rel_offset_top > viewport) { + container.scrollTop = row.offsetTop; + } else if (rel_offset_bottom > viewport) { + container.scrollTop = row.offsetTop + row.offsetHeight - viewport; } - } function headlineActionsChange(elem) { - try { - eval(elem.value); - elem.attr('value', 'false'); - } catch (e) { - exception_error("headlineActionsChange", e); - } + eval(elem.value); + elem.attr('value', 'false'); } function closeArticlePanel() { - if (dijit.byId("content-insert")) dijit.byId("headlines-wrap-inner").removeChild( dijit.byId("content-insert")); } function initFloatingMenu() { - try { - if (!dijit.byId("floatingMenu")) { - - var menu = new dijit.Menu({ - id: "floatingMenu", - targetNodeIds: ["floatingTitle"] - }); - - var tmph = dojo.connect(menu, '_openMyself', function (event) { - var callerNode = event.target, match = null, tries = 0; - - while (match == null && callerNode && tries <= 3) { - match = callerNode.getAttribute("data-article-id"); - callerNode = callerNode.parentNode; - ++tries; - } + if (!dijit.byId("floatingMenu")) { - if (match) this.callerRowId = match; - - }); - - headlinesMenuCommon(menu); + const menu = new dijit.Menu({ + id: "floatingMenu", + targetNodeIds: ["floatingTitle"] + }); - menu.startup(); - } + headlinesMenuCommon(menu); - } catch (e) { - exception_error("initFloatingMenu", e); + menu.startup(); } } function headlinesMenuCommon(menu) { - try { - - menu.addChild(new dijit.MenuItem({ - label: __("Open original article"), - onClick: function(event) { - openArticleInNewWindow(this.getParent().callerRowId); - }})); - menu.addChild(new dijit.MenuItem({ - label: __("Display article URL"), - onClick: function(event) { - displayArticleUrl(this.getParent().callerRowId); - }})); + menu.addChild(new dijit.MenuItem({ + label: __("Open original article"), + onClick: function (event) { + openArticleInNewWindow(this.getParent().currentTarget.getAttribute("data-article-id")); + } + })); - menu.addChild(new dijit.MenuSeparator()); + menu.addChild(new dijit.MenuItem({ + label: __("Display article URL"), + onClick: function (event) { + displayArticleUrl(this.getParent().currentTarget.getAttribute("data-article-id")); + } + })); - menu.addChild(new dijit.MenuItem({ - label: __("Toggle unread"), - onClick: function(event) { - var ids = getSelectedArticleIds2(); - // cast to string - var id = (this.getParent().callerRowId) + ""; - ids = ids.size() != 0 && ids.indexOf(id) != -1 ? ids : [id]; + menu.addChild(new dijit.MenuSeparator()); - selectionToggleUnread(undefined, false, true, ids); - }})); + menu.addChild(new dijit.MenuItem({ + label: __("Toggle unread"), + onClick: function () { - menu.addChild(new dijit.MenuItem({ - label: __("Toggle starred"), - onClick: function(event) { - var ids = getSelectedArticleIds2(); - // cast to string - var id = (this.getParent().callerRowId) + ""; - ids = ids.size() != 0 && ids.indexOf(id) != -1 ? ids : [id]; + let ids = getSelectedArticleIds2(); + // cast to string + const id = (this.getParent().currentTarget.getAttribute("data-article-id")) + ""; + ids = ids.length != 0 && ids.indexOf(id) != -1 ? ids : [id]; - selectionToggleMarked(undefined, false, true, ids); - }})); + selectionToggleUnread(undefined, false, true, ids); + } + })); - menu.addChild(new dijit.MenuItem({ - label: __("Toggle published"), - onClick: function(event) { - var ids = getSelectedArticleIds2(); - // cast to string - var id = (this.getParent().callerRowId) + ""; - ids = ids.size() != 0 && ids.indexOf(id) != -1 ? ids : [id]; + menu.addChild(new dijit.MenuItem({ + label: __("Toggle starred"), + onClick: function () { + let ids = getSelectedArticleIds2(); + // cast to string + const id = (this.getParent().currentTarget.getAttribute("data-article-id")) + ""; + ids = ids.length != 0 && ids.indexOf(id) != -1 ? ids : [id]; - selectionTogglePublished(undefined, false, true, ids); - }})); + selectionToggleMarked(undefined, false, true, ids); + } + })); - menu.addChild(new dijit.MenuSeparator()); + menu.addChild(new dijit.MenuItem({ + label: __("Toggle published"), + onClick: function () { + let ids = getSelectedArticleIds2(); + // cast to string + const id = (this.getParent().currentTarget.getAttribute("data-article-id")) + ""; + ids = ids.length != 0 && ids.indexOf(id) != -1 ? ids : [id]; - menu.addChild(new dijit.MenuItem({ - label: __("Mark above as read"), - onClick: function(event) { - catchupRelativeToArticle(0, this.getParent().callerRowId); - }})); + selectionTogglePublished(undefined, false, true, ids); + } + })); - menu.addChild(new dijit.MenuItem({ - label: __("Mark below as read"), - onClick: function(event) { - catchupRelativeToArticle(1, this.getParent().callerRowId); - }})); + menu.addChild(new dijit.MenuSeparator()); + menu.addChild(new dijit.MenuItem({ + label: __("Mark above as read"), + onClick: function () { + catchupRelativeToArticle(0, this.getParent().currentTarget.getAttribute("data-article-id")); + } + })); - var labels = dijit.byId("feedTree").model.getItemsInCategory(-2); + menu.addChild(new dijit.MenuItem({ + label: __("Mark below as read"), + onClick: function () { + catchupRelativeToArticle(1, this.getParent().currentTarget.getAttribute("data-article-id")); + } + })); - if (labels) { - menu.addChild(new dijit.MenuSeparator()); + const labels = getInitParam("labels"); - var labelAddMenu = new dijit.Menu({ownerMenu: menu}); - var labelDelMenu = new dijit.Menu({ownerMenu: menu}); + if (labels && labels.length) { - labels.each(function(label) { - var id = label.id[0]; - var bare_id = id.substr(id.indexOf(":")+1); - var name = label.name[0]; + menu.addChild(new dijit.MenuSeparator()); - bare_id = feed_to_label_id(bare_id); + const labelAddMenu = new dijit.Menu({ownerMenu: menu}); + const labelDelMenu = new dijit.Menu({ownerMenu: menu}); - labelAddMenu.addChild(new dijit.MenuItem({ - label: name, - labelId: bare_id, - onClick: function(event) { - var ids = getSelectedArticleIds2(); - // cast to string - var id = (this.getParent().ownerMenu.callerRowId) + ""; + labels.each(function (label) { + const bare_id = label.id; + const name = label.caption; - ids = ids.size() != 0 && ids.indexOf(id) != -1 ? ids : [id]; + labelAddMenu.addChild(new dijit.MenuItem({ + label: name, + labelId: bare_id, + onClick: function () { - selectionAssignLabel(this.labelId, ids); - }})); + let ids = getSelectedArticleIds2(); + // cast to string + const id = (this.getParent().ownerMenu.currentTarget.getAttribute("data-article-id")) + ""; - labelDelMenu.addChild(new dijit.MenuItem({ - label: name, - labelId: bare_id, - onClick: function(event) { - var ids = getSelectedArticleIds2(); - // cast to string - var id = (this.getParent().ownerMenu.callerRowId) + ""; + ids = ids.length != 0 && ids.indexOf(id) != -1 ? ids : [id]; - ids = ids.size() != 0 && ids.indexOf(id) != -1 ? ids : [id]; + selectionAssignLabel(this.labelId, ids); + } + })); - selectionRemoveLabel(this.labelId, ids); - }})); + labelDelMenu.addChild(new dijit.MenuItem({ + label: name, + labelId: bare_id, + onClick: function () { + let ids = getSelectedArticleIds2(); + // cast to string + const id = (this.getParent().ownerMenu.currentTarget.getAttribute("data-article-id")) + ""; - }); + ids = ids.length != 0 && ids.indexOf(id) != -1 ? ids : [id]; - menu.addChild(new dijit.PopupMenuItem({ - label: __("Assign label"), - popup: labelAddMenu + selectionRemoveLabel(this.labelId, ids); + } })); - menu.addChild(new dijit.PopupMenuItem({ - label: __("Remove label"), - popup: labelDelMenu - })); + }); - } + menu.addChild(new dijit.PopupMenuItem({ + label: __("Assign label"), + popup: labelAddMenu + })); + menu.addChild(new dijit.PopupMenuItem({ + label: __("Remove label"), + popup: labelDelMenu + })); - } catch (e) { - exception_error("headlinesMenuCommon", e); } } function initHeadlinesMenu() { - try { - if (dijit.byId("headlinesMenu")) - dijit.byId("headlinesMenu").destroyRecursive(); + if (!dijit.byId("headlinesMenu")) { - var ids = []; - - if (!isCdmMode()) { - nodes = $$("#headlines-frame > div[id*=RROW]"); - } else { - nodes = $$("#headlines-frame span[id*=RTITLE]"); - } - - nodes.each(function(node) { - ids.push(node.id); - }); - - var menu = new dijit.Menu({ + const menu = new dijit.Menu({ id: "headlinesMenu", - targetNodeIds: ids - }); - - var tmph = dojo.connect(menu, '_openMyself', function (event) { - var callerNode = event.target, match = null, tries = 0; - - while (match == null && callerNode && tries <= 3) { - - match = callerNode.getAttribute("data-article-id") - callerNode = callerNode.parentNode; - ++tries; - } - - if (match) this.callerRowId = match; - + targetNodeIds: ["headlines-frame"], + selector: ".hlMenuAttach" }); headlinesMenuCommon(menu); menu.startup(); + } - /* vgroup feed title menu */ + /* vgroup feed title menu */ - var nodes = $$("#headlines-frame > div[class='cdmFeedTitle']"); - var ids = []; + if (!dijit.byId("headlinesFeedTitleMenu")) { - nodes.each(function(node) { - ids.push(node.id); + const menu = new dijit.Menu({ + id: "headlinesFeedTitleMenu", + targetNodeIds: ["headlines-frame"], + selector: "div.cdmFeedTitle" }); - if (ids.length > 0) { - if (dijit.byId("headlinesFeedTitleMenu")) - dijit.byId("headlinesFeedTitleMenu").destroyRecursive(); - - var menu = new dijit.Menu({ - id: "headlinesFeedTitleMenu", - targetNodeIds: ids - }); - - var tmph = dojo.connect(menu, '_openMyself', function (event) { - var callerNode = event.target, match = null, tries = 0; - - while (match == null && callerNode && tries <= 3) { - match = callerNode.getAttribute("data-feed-id") - callerNode = callerNode.parentNode; - ++tries; - } - - if (match) this.callerRowId = match; - - }); - - menu.addChild(new dijit.MenuItem({ - label: __("Select articles in group"), - onClick: function(event) { - selectArticles("all", - "#headlines-frame > div[id*=RROW]"+ - "[data-orig-feed-id='"+menu.callerRowId+"']"); - - }})); - - menu.addChild(new dijit.MenuItem({ - label: __("Mark group as read"), - onClick: function(event) { - selectArticles("none"); - selectArticles("all", - "#headlines-frame > div[id*=RROW]"+ - "[data-orig-feed-id='"+menu.callerRowId+"']"); - - catchupSelection(); - }})); + menu.addChild(new dijit.MenuItem({ + label: __("Select articles in group"), + onClick: function (event) { + selectArticles("all", + "#headlines-frame > div[id*=RROW]" + + "[data-orig-feed-id='" + this.getParent().currentTarget.getAttribute("data-feed-id") + "']"); + } + })); - menu.addChild(new dijit.MenuItem({ - label: __("Mark feed as read"), - onClick: function(event) { - catchupFeedInGroup(menu.callerRowId); - }})); + menu.addChild(new dijit.MenuItem({ + label: __("Mark group as read"), + onClick: function () { + selectArticles("none"); + selectArticles("all", + "#headlines-frame > div[id*=RROW]" + + "[data-orig-feed-id='" + this.getParent().currentTarget.getAttribute("data-feed-id") + "']"); - menu.addChild(new dijit.MenuItem({ - label: __("Edit feed"), - onClick: function(event) { - editFeed(menu.callerRowId); - }})); + catchupSelection(); + } + })); - menu.startup(); + menu.addChild(new dijit.MenuItem({ + label: __("Mark feed as read"), + onClick: function () { + catchupFeedInGroup(this.getParent().currentTarget.getAttribute("data-feed-id")); + } + })); - } + menu.addChild(new dijit.MenuItem({ + label: __("Edit feed"), + onClick: function () { + editFeed(this.getParent().currentTarget.getAttribute("data-feed-id")); + } + })); - } catch (e) { - exception_error("initHeadlinesMenu", e); + menu.startup(); } } @@ -2117,212 +1802,129 @@ function cache_delete(id) { } function cancelSearch() { - try { - _search_query = ""; - viewCurrentFeed(); - } catch (e) { - exception_error("cancelSearch", e); - } + _search_query = ""; + viewCurrentFeed(); } function setSelectionScore() { - try { - var ids = getSelectedArticleIds2(); - - if (ids.length > 0) { - console.log(ids); + const ids = getSelectedArticleIds2(); - var score = prompt(__("Please enter new score for selected articles:"), score); + if (ids.length > 0) { + console.log(ids); - if (score != undefined) { - var query = "op=article&method=setScore&id=" + param_escape(ids.toString()) + - "&score=" + param_escape(score); + const score = prompt(__("Please enter new score for selected articles:")); - new Ajax.Request("backend.php", { - parameters: query, - onComplete: function(transport) { - var reply = JSON.parse(transport.responseText); - if (reply) { - console.log(ids); + if (score != undefined) { + const query = { op: "article", method: "setScore", id: ids.toString(), + score: score }; - ids.each(function(id) { - var row = $("RROW-" + id); + xhrJson("backend.php", query, (reply) => { + if (reply) { + reply.id.each((id) => { + const row = $("RROW-" + id); - if (row) { - var pic = row.getElementsByClassName("hlScorePic")[0]; + if (row) { + const pic = row.getElementsByClassName("score-pic")[0]; - if (pic) { - pic.src = pic.src.replace(/score_.*?\.png/, - reply["score_pic"]); - pic.setAttribute("score", score); - } - } - }); + if (pic) { + pic.src = pic.src.replace(/score_.*?\.png/, + reply["score_pic"]); + pic.setAttribute("score", reply["score"]); + } } - } }); - } - - } else { - alert(__("No articles are selected.")); - } - } catch (e) { - exception_error("setSelectionScore", e); - } -} - -function updateScore(id) { - try { - var pic = $$("#RROW-" + id + " .hlScorePic")[0]; - - if (pic) { - - var query = "op=article&method=getScore&id=" + param_escape(id); - - new Ajax.Request("backend.php", { - parameters: query, - onComplete: function(transport) { - console.log(transport.responseText); - - var reply = JSON.parse(transport.responseText); - - if (reply) { - pic.src = pic.src.replace(/score_.*?\.png/, reply["score_pic"]); - pic.setAttribute("score", reply["score"]); - pic.setAttribute("title", reply["score"]); - } - } }); + }); + } + }); } - } catch (e) { - exception_error("updateScore", e); + } else { + alert(__("No articles are selected.")); } } function changeScore(id, pic) { - try { - var score = pic.getAttribute("score"); - - var new_score = prompt(__("Please enter new score for this article:"), score); + const score = pic.getAttribute("score"); - if (new_score != undefined) { + const new_score = prompt(__("Please enter new score for this article:"), score); - var query = "op=article&method=setScore&id=" + param_escape(id) + - "&score=" + param_escape(new_score); + if (new_score != undefined) { + const query = { op: "article", method: "setScore", id: id, score: new_score }; - new Ajax.Request("backend.php", { - parameters: query, - onComplete: function(transport) { - var 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); - } - } }); - } - } catch (e) { - exception_error("changeScore", e); + 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) { - try { - var 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) { - var reply = JSON.parse(transport.responseText); + xhrJson("backend.php", query, (reply) => { + if (reply && reply.link) { + prompt(__("Article URL:"), reply.link); + } + }); - if (reply && reply.link) { - prompt(__("Article URL:"), reply.link); - } - } }); - } catch (e) { - exception_error("changeScore", e); - } } +// floatingTitle goto button uses this function scrollToRowId(id) { - try { - var row = $(id); - - if (row) - $("headlines-frame").scrollTop = row.offsetTop - 4; + const row = $(id); - } catch (e) { - exception_error("scrollToRowId", e); - } + if (row) + $("headlines-frame").scrollTop = row.offsetTop - 4; } function updateFloatingTitle(unread_only) { - try { - if (!isCdmMode()) return; - - var hf = $("headlines-frame"); + if (!isCdmMode()) return; - var elems = $$("#headlines-frame > div[id*=RROW]"); + const hf = $("headlines-frame"); + const elems = $$("#headlines-frame > div[id*=RROW]"); - for (var i = 0; i < elems.length; i++) { + for (let i = 0; i < elems.length; i++) { - var child = elems[i]; + const child = elems[i]; - if (child && child.offsetTop + child.offsetHeight > hf.scrollTop) { + if (child && child.offsetTop + child.offsetHeight > hf.scrollTop) { - var 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")) { + if (unread_only || child.getAttribute("data-article-id") != $("floatingTitle").getAttribute("data-article-id")) { + if (child.getAttribute("data-article-id") != $("floatingTitle").getAttribute("data-article-id")) { - $("floatingTitle").setAttribute("data-article-id", child.getAttribute("data-article-id")); - $("floatingTitle").innerHTML = header.innerHTML; - $("floatingTitle").firstChild.innerHTML = "" + $("floatingTitle").firstChild.innerHTML; + $("floatingTitle").setAttribute("data-article-id", child.getAttribute("data-article-id")); + $("floatingTitle").innerHTML = header.innerHTML; + $("floatingTitle").firstChild.innerHTML = "" + $("floatingTitle").firstChild.innerHTML; - initFloatingMenu(); + initFloatingMenu(); - var cb = $$("#floatingTitle .dijitCheckBox")[0]; + const cb = $$("#floatingTitle .dijitCheckBox")[0]; - if (cb) - cb.parentNode.removeChild(cb); - } - - if (child.hasClassName("Unread")) - $("floatingTitle").addClassName("Unread"); - else - $("floatingTitle").removeClassName("Unread"); - - PluginHost.run(PluginHost.HOOK_FLOATING_TITLE, child); + if (cb) + cb.parentNode.removeChild(cb); } - $("floatingTitle").style.marginRight = hf.offsetWidth - child.offsetWidth + "px"; - if (header.offsetTop + header.offsetHeight < hf.scrollTop + $("floatingTitle").offsetHeight - 5 && - child.offsetTop + child.offsetHeight >= hf.scrollTop + $("floatingTitle").offsetHeight - 5) - $("floatingTitle").style.visibility = "visible"; + if (child.hasClassName("Unread")) + $("floatingTitle").addClassName("Unread"); else - $("floatingTitle").style.visibility = "hidden"; - - return; + $("floatingTitle").removeClassName("Unread"); + PluginHost.run(PluginHost.HOOK_FLOATING_TITLE, child); } - } - } catch (e) { - exception_error("updateFloatingTitle", e); - } -} + $("floatingTitle").style.marginRight = hf.offsetWidth - child.offsetWidth + "px"; + if (header.offsetTop + header.offsetHeight < hf.scrollTop + $("floatingTitle").offsetHeight - 5 && + child.offsetTop + child.offsetHeight >= hf.scrollTop + $("floatingTitle").offsetHeight - 5) + $("floatingTitle").style.visibility = "visible"; + else + $("floatingTitle").style.visibility = "hidden"; -function catchupCurrentBatchIfNeeded() { - if (catchup_id_batch.length > 0) { - window.clearTimeout(catchup_timeout_id); - catchup_timeout_id = window.setTimeout(catchupBatchedArticles, 1000); + return; - if (catchup_id_batch.length >= 10) { - catchupBatchedArticles(); } } } - -function cdmFooterClick(event) { - event.stopPropagation(); -} \ No newline at end of file