X-Git-Url: https://git.wh0rd.org/?p=tt-rss.git;a=blobdiff_plain;f=js%2Fviewfeed.js;h=6ae9cdd8a503fe42cd51c65775de293d81e41d2c;hp=846c87a8f39ec8c7af0cf1bee530af026fe6a468;hb=0c06bb5fe1278b7d92926b21b000e9c966e19ee6;hpb=b7c20a3759ef456a065748f249837edb1264b864 diff --git a/js/viewfeed.js b/js/viewfeed.js old mode 100644 new mode 100755 index 846c87a8..6ae9cdd8 --- a/js/viewfeed.js +++ b/js/viewfeed.js @@ -1,959 +1,761 @@ -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; +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 has_storage = 'sessionStorage' in window && window['sessionStorage'] !== null; +let _catchup_request_sent = false; + +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; + var is_cat = false; + var 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 != 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; + $("headlines-frame").removeClassName("cdm"); + $("headlines-frame").removeClassName("normal"); - Element.hide("floatingTitle"); - $("floatingTitle").setAttribute("rowid", 0); - $("floatingTitle").innerHTML = ""; - } - } catch (e) { }; + $("headlines-frame").addClassName(isCdmMode() ? "cdm" : "normal"); - $("headlines-frame").removeClassName("cdm"); - $("headlines-frame").removeClassName("normal"); + const headlines_count = reply['headlines-info']['count']; - $("headlines-frame").addClassName(isCdmMode() ? "cdm" : "normal"); + vgroup_last_feed = reply['headlines-info']['vgroup_last_feed']; - var headlines_count = reply['headlines-info']['count']; + if (parseInt(headlines_count) < 30) { + _infscroll_disable = 1; + } else { + _infscroll_disable = 0; + } - vgroup_last_feed = reply['headlines-info']['vgroup_last_feed']; + current_first_id = reply['headlines']['first_id']; + const counters = reply['counters']; + const articles = reply['articles']; - if (parseInt(headlines_count) < 30) { - _infscroll_disable = 1; - } else { - _infscroll_disable = 0; - } + if (infscroll_req == false) { + loaded_article_ids = []; - var counters = reply['counters']; - var articles = reply['articles']; - //var runtime_info = reply['runtime-info']; + dojo.html.set($("headlines-toolbar"), + reply['headlines']['toolbar'], + {parseContent: true}); - if (infscroll_req == false) { - loaded_article_ids = []; + $("headlines-frame").innerHTML = ''; - dijit.byId("headlines-frame").attr('content', - reply['headlines']['content']); + let tmp = document.createElement("div"); + tmp.innerHTML = reply['headlines']['content']; + dojo.parser.parse(tmp); - //dijit.byId("headlines-toolbar").attr('content', - // reply['headlines']['toolbar']); + while (tmp.hasChildNodes()) { + var row = tmp.removeChild(tmp.firstChild); - dojo.html.set($("headlines-toolbar"), - reply['headlines']['toolbar'], - {parseContent: true}); + if (loaded_article_ids.indexOf(row.id) == -1 || row.hasClassName("cdmFeedTitle")) { + dijit.byId("headlines-frame").domNode.appendChild(row); - $$("#headlines-frame > div[id*=RROW]").each(function(row) { - if (loaded_article_ids.indexOf(row.id) != -1) { - row.parentNode.removeChild(row); - } else { - 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); + let hsp = $("headlines-spacer"); + if (!hsp) hsp = new Element("DIV", {"id": "headlines-spacer"}); + dijit.byId('headlines-frame').domNode.appendChild(hsp); - initHeadlinesMenu(); + initHeadlinesMenu(); - if (_search_query) { - $("feed_title").innerHTML += "" + - " (" + __("Cancel search") + ")" + - ""; - } + if (_infscroll_disable) + hsp.innerHTML = "" + + __("Click to open next unread feed.") + ""; - } else { + if (_search_query) { + $("feed_title").innerHTML += "" + + " (" + __("Cancel search") + ")" + + ""; + } - if (headlines_count > 0 && feed_id == getActiveFeedId() && is_cat == activeFeedIsCat()) { - console.log("adding some more headlines: " + headlines_count); + } else if (headlines_count > 0 && feed_id == getActiveFeedId() && is_cat == activeFeedIsCat()) { + console.log("adding some more headlines: " + headlines_count); - var c = dijit.byId("headlines-frame"); - var ids = getSelectedArticleIds2(); - var new_elems = []; + const c = dijit.byId("headlines-frame"); + const ids = getSelectedArticleIds2(); - $("headlines-tmp").innerHTML = reply['headlines']['content']; + let hsp = $("headlines-spacer"); - var hsp = $("headlines-spacer"); + if (hsp) + c.domNode.removeChild(hsp); - if (hsp) - c.domNode.removeChild(hsp); + let tmp = document.createElement("div"); + tmp.innerHTML = reply['headlines']['content']; + dojo.parser.parse(tmp); - $$("#headlines-tmp > div").each(function(row) { - if (row.className == 'cdmFeedTitle') { - row.style.display = 'none'; - c.domNode.appendChild(row); - new_elems.push(row); - } else if (loaded_article_ids.indexOf(row.id) == -1) { - row.style.display = 'none'; - c.domNode.appendChild(row); - new_elems.push(row); - loaded_article_ids.push(row.id); - } else { - row.parentNode.removeChild(row); - } - }); + while (tmp.hasChildNodes()) { + let row = tmp.removeChild(tmp.firstChild); - if (!hsp) hsp = new Element("DIV", {"id": "headlines-spacer"}); + if (loaded_article_ids.indexOf(row.id) == -1 || row.hasClassName("cdmFeedTitle")) { + dijit.byId("headlines-frame").domNode.appendChild(row); - if (getInitParam("cdm_auto_catchup") == 1) { - c.domNode.appendChild(hsp); + loaded_article_ids.push(row.id); } + } - console.log("added " + new_elems.size() + " headlines"); + if (!hsp) hsp = new Element("DIV", {"id": "headlines-spacer"}); + c.domNode.appendChild(hsp); - if (new_elems.size() == 0) - _infscroll_disable = true; + if (headlines_count < 30) _infscroll_disable = true; - console.log("restore selected ids: " + ids); + console.log("restore selected ids: " + ids); - for (var i = 0; i < ids.length; i++) { - markHeadline(ids[i]); - } + for (let i = 0; i < ids.length; i++) { + markHeadline(ids[i]); + } - initHeadlinesMenu(); + initHeadlinesMenu(); - new_elems.each(function(child) { - dojo.parser.parse(child); + if (_infscroll_disable) { + hsp.innerHTML = "" + + __("Click to open next unread feed.") + ""; + } - if (!Element.visible(child)) - new Effect.Appear(child, { duration : 0.5 }); - }); + } else { + console.log("no new headlines received"); - } else { - console.log("no new headlines received"); + const first_id_changed = reply['headlines']['first_id_changed']; + console.log("first id changed:" + first_id_changed); - var hsp = $("headlines-spacer"); + let hsp = $("headlines-spacer"); - if (hsp) hsp.innerHTML = ""; - } - } + 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); + } + if (articles) { + for (let i = 0; i < articles.length; i++) { + const a_id = articles[i]['id']; + cache_set("article:" + a_id, articles[i]['content']); + } } 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)') + - "
"); + console.log("no cached articles received"); } - _infscroll_request_sent = 0; - _last_headlines_update = new Date().getTime(); + if (counters) + parse_counters(counters); + else + request_counters(); - 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 { - dijit.byId("headlines-wrap-inner").addChild( - dijit.byId("content-insert")); + cleanup_memory("content-insert"); - var c = dijit.byId("content-insert"); - - try { - c.domNode.scrollTop = 0; - } catch (e) { }; + dijit.byId("headlines-wrap-inner").addChild( + dijit.byId("content-insert")); - PluginHost.run(PluginHost.HOOK_ARTICLE_RENDERED, article); + const c = dijit.byId("content-insert"); - c.attr('content', article); + 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 { - selectArticles("none"); - - var crow = $("RROW-" + id); - - if (!crow) return; - - var article_is_unread = crow.hasClassName("Unread"); - - if (!noexpand) - crow.removeClassName("Unread"); - crow.addClassName("active"); - - selectArticles('none'); - - var view_mode = false; + if (!noexpand) + row.removeClassName("Unread"); - try { - view_mode = document.forms['main_toolbar_form'].view_mode; - view_mode = view_mode[view_mode.selectedIndex].value; - } catch (e) { - // - } - - markHeadline(id); + row.addClassName("active"); - if (article_is_unread && !noexpand) - _force_scheduled_update = true; + selectArticles('none'); - } catch (e) { - exception_error("showArticleInHeadlines", e); - } + markHeadline(id); } function article_callback2(transport, id) { - try { - console.log("article_callback2 " + id); - - handle_rpc_json(transport); + console.log("article_callback2 " + id); - var reply = false; + const reply = handle_rpc_json(transport); - try { - reply = JSON.parse(transport.responseText); - } catch (e) { - console.error(e); - } - - if (reply) { - - reply.each(function(article) { - if (getActiveArticleId() == article['id']) { - render_article(article['content']); - } - cids_requested.remove(article['id']); - - cache_set("article:" + article['id'], article['content']); - }); + if (reply) { -// if (id != last_requested_article) { -// console.log("requested article id is out of sequence, aborting"); -// return; -// } - - } else { - console.error("Invalid object received: " + transport.responseText); - - render_article("
" + - __('Could not display article (invalid object received - see error console for details)') + "
"); - } + reply.each(function(article) { + if (getActiveArticleId() == article['id']) { + render_article(article['content']); + } + cids_requested.remove(article['id']); - var unread_in_buffer = $$("#headlines-frame > div[id*=RROW][class*=Unread]").length - request_counters(unread_in_buffer == 0); + cache_set("article:" + article['id'], article['content']); + }); - //headlines_scroll_handler($("headlines-frame")); + } else { + console.error("Invalid object received: " + transport.responseText); -/* try { - if (!_infscroll_disable && - $$("#headlines-frame > div[id*=RROW]").last().hasClassName("Selected")) { + render_article("
" + + __('Could not display article (invalid object received - see error console for details)') + "
"); + } - loadMoreHeadlines(); - } - } catch (e) { - console.warn(e); - } */ + const unread_in_buffer = $$("#headlines-frame > div[id*=RROW][class*=Unread]").length; + request_counters(unread_in_buffer == 0); - notify(""); - } catch (e) { - exception_error("article_callback2", e, transport); - } + notify(""); } function view(id, activefeed, noexpand) { - try { - var oldrow = $("RROW-" + getActiveArticleId()); - if (oldrow) oldrow.removeClassName("active"); - - var crow = $("RROW-" + id); - - if (!crow) return; - if (noexpand) { - setActiveArticleId(id); - showArticleInHeadlines(id, noexpand); - return; - } - - console.log("loading article: " + id); - - var cached_article = cache_get("article:" + id); - - console.log("cache check result: " + (cached_article != false)); + const oldrow = $("RROW-" + getActiveArticleId()); + if (oldrow) oldrow.removeClassName("active"); - var query = "?op=article&method=view&id=" + param_escape(id); + const crow = $("RROW-" + id); - var neighbor_ids = getRelativePostIds(id); - - /* only request uncached articles */ - - var cids_to_request = []; - - 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]); - } - } + if (!crow) return; + if (noexpand) { + setActiveArticleId(id); + showArticleInHeadlines(id, noexpand); + return; + } - console.log("additional ids: " + cids_to_request.toString()); + console.log("loading article: " + id); - query = query + "&cids=" + cids_to_request.toString(); + const cached_article = cache_get("article:" + id); - var article_is_unread = crow.hasClassName("Unread"); + console.log("cache check result: " + (cached_article != false)); - setActiveArticleId(id); - showArticleInHeadlines(id); + const query = {op: "article", method: "view", id: id}; - if (cached_article && article_is_unread) { + const neighbor_ids = getRelativePostIds(id); - query = query + "&mode=prefetch"; + /* only request uncached articles */ - render_article(cached_article); + const cids_to_request = []; - } else if (cached_article) { + 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]); + } + } - query = query + "&mode=prefetch_old"; - render_article(cached_article); + console.log("additional ids: " + cids_to_request.toString()); - // 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) { + query.cids = cids_to_request.toString(); -/* try { - if (!_infscroll_disable && - $$("#headlines-frame > div[id*=RROW]").last().hasClassName("Selected")) { + const article_is_unread = crow.hasClassName("Unread"); - loadMoreHeadlines(); - } - } catch (e) { - console.warn(e); - } */ + setActiveArticleId(id); + showArticleInHeadlines(id); - //headlines_scroll_handler($("headlines-frame")); + 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); - return; - } + // 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; } + } - last_requested_article = id; + last_requested_article = id; - console.log(query); + console.log(query); - if (article_is_unread) { - decrementFeedCounter(getActiveFeedId(), activeFeedIsCat()); - } + if (article_is_unread) { + 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; + return false; - } catch (e) { - exception_error("view", e); - } } 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("rowid") == "RROW-" + 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("rowid") == "RROW-" + 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 = getVisibleArticleIds(); + 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; } } + } - 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) { + var article = $("RROW-" + getActiveArticleId()); + var 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); } + + } else if (next_id) { + correctHeadlinesOffset(next_id); + view(next_id, getActiveFeedId(), 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 (!noscroll && article && article.offsetTop < ctr.scrollTop) { - scrollArticle(-ctr.offsetHeight/4); - } else { - cdmExpandArticle(prev_id, noexpand); - cdmScrollToArticleId(prev_id, true); - } - } else { + if (mode == "prev") { + if (prev_id || getActiveArticleId()) { + if (isCdmMode()) { - 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); - } - } + var article = $("RROW-" + getActiveArticleId()); + const prev_article = $("RROW-" + prev_id); + var 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); } + + } else if (prev_id) { + correctHeadlinesOffset(prev_id); + view(prev_id, getActiveFeedId(), noexpand); } } - - } catch (e) { - exception_error("moveToPost", e); } + } function toggleSelected(id, force_on) { - try { - var row = $("RROW-" + id); + 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); } + + updateSelectedPrompt(); } function updateSelectedPrompt() { - try { - var count = getSelectedArticleIds2().size(); - var elem = $("selected_prompt"); + const count = getSelectedArticleIds2().length; + const elem = $("selected_prompt"); - if (elem) { - elem.innerHTML = ngettext("%d article selected", - "%d articles selected", count).replace("%d", count); - - 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_afh(effect) { - try { - - var elem = effect.element; - elem.style.backgroundColor = ""; - } catch (e) { - exception_error("toggleUnread_afh", e); - } } -function toggleUnread(id, cmode, effect) { - try { - - var row = $("RROW-" + id); - if (row) { - if (cmode == undefined || cmode == 2) { - if (row.hasClassName("Unread")) { - row.removeClassName("Unread"); - - } else { - row.addClassName("Unread"); - } - - } else if (cmode == 0) { +function toggleUnread(id, cmode) { + const row = $("RROW-" + id); + 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; + } else if (cmode == 0) { + + row.removeClassName("Unread"); + + } else if (cmode == 1) { + row.addClassName("Unread"); + } - var 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}; - new Ajax.Request("backend.php", { - parameters: query, - onComplete: function(transport) { + 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); + 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: "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); - - 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: "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 { - - 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++) { - toggleMark(rows[i], true, true); - } - - if (rows.length > 0) { + if (rows.length == 0 && !no_error) { + alert(__("No articles are selected.")); + return; + } - var query = "?op=rpc&method=markSelected&ids=" + - param_escape(rows.toString()) + "&cmode=2"; + for (let i = 0; i < rows.length; i++) { + toggleMark(rows[i], true, true); + } - new Ajax.Request("backend.php", { - parameters: query, - onComplete: function(transport) { - handle_rpc_json(transport); - if (callback) callback(transport); - } }); + 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); - } + const rows = ids ? ids : getSelectedArticleIds2(); - if (rows.length > 0) { - - 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.id.replace("RROW-", "")); + rv.push(child.getAttribute("data-article-id")); }); 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) { - rv.push(child.id.replace("RROW-", "")); - }); + if (Element.visible(child)) { + rv.push(child.getAttribute("data-article-id")); + } + }); return rv; @@ -961,271 +763,231 @@ function getLoadedArticleIds() { // mode = all,none,unread,invert,marked,published function selectArticles(mode, query) { - try { + if (!query) query = "#headlines-frame > div[id*=RROW]"; - if (!query) query = "#headlines-frame > div[id*=RROW]"; + const children = $$(query); - var children = $$(query); - - children.each(function(child) { - var id = child.id.replace("RROW-", ""); + children.each(function(child) { + //const id = child.getAttribute("data-article-id"); - var cb = dijit.getEnclosingWidget( - child.getElementsByClassName("rchk")[0]); + const cb = dijit.getEnclosingWidget( + child.getElementsByClassName("rchk")[0]); - if (mode == "all") { + 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 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); - } - - } 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); - } - } 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); + } + + } 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); + } - updateSelectedPrompt(); + } else { + child.removeClassName("Selected"); + if (cb) cb.attr("checked", false); + } + }); - } catch (e) { - exception_error("selectArticles", e); - } + updateSelectedPrompt(); } function deleteSelection() { - try { - - var rows = getSelectedArticleIds2(); - - if (rows.length == 0) { - alert(__("No articles are selected.")); - return; - } + const rows = getSelectedArticleIds2(); - var fn = getFeedName(getActiveFeedId(), activeFeedIsCat()); - var str; - - 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 (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()); + let str; - if (getInitParam("confirm_feed_catchup") == 1 && !confirm(str)) { - return; - } + 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); + } - query = "?op=rpc&method=delete&ids=" + param_escape(rows); + str = str.replace("%d", rows.length); + str = str.replace("%s", fn); - console.log(query); + if (getInitParam("confirm_feed_catchup") == 1 && !confirm(str)) { + return; + } - new Ajax.Request("backend.php", { - parameters: query, - onComplete: function(transport) { - handle_rpc_json(transport); - viewCurrentFeed(); - } }); + const query = { op: "rpc", method: "delete", ids: rows.toString() }; - } catch (e) { - exception_error("deleteSelection", e); - } + xhrPost("backend.php", query, (transport) => { + handle_rpc_json(transport); + viewCurrentFeed(); + }); } function archiveSelection() { - try { - - var rows = getSelectedArticleIds2(); + const rows = getSelectedArticleIds2(); - if (rows.length == 0) { - alert(__("No articles are selected.")); - return; - } + if (rows.length == 0) { + alert(__("No articles are selected.")); + return; + } - var fn = getFeedName(getActiveFeedId(), activeFeedIsCat()); - var str; - var op; + const fn = getFeedName(getActiveFeedId(), activeFeedIsCat()); + let str; + let op; - if (getActiveFeedId() != 0) { - str = ngettext("Archive %d selected article in %s?", "Archive %d selected articles in %s?", rows.length); - op = "archive"; - } else { - str = ngettext("Move %d archived article back?", "Move %d archived articles back?", rows.length); + if (getActiveFeedId() != 0) { + str = ngettext("Archive %d selected article in %s?", "Archive %d selected articles in %s?", rows.length); + op = "archive"; + } else { + str = ngettext("Move %d archived article back?", "Move %d archived articles back?", rows.length); - str += " " + __("Please note that unstarred articles might get purged on next feed update."); + str += " " + __("Please note that unstarred articles might get purged on next feed update."); - op = "unarchive"; - } - - str = str.replace("%d", rows.length); - str = str.replace("%s", fn); - - if (getInitParam("confirm_feed_catchup") == 1 && !confirm(str)) { - return; - } + op = "unarchive"; + } - query = "?op=rpc&method="+op+"&ids=" + param_escape(rows); + str = str.replace("%d", rows.length); + str = str.replace("%s", fn); - console.log(query); + if (getInitParam("confirm_feed_catchup") == 1 && !confirm(str)) { + return; + } - for (var i = 0; i < rows.length; i++) { - cache_delete("article:" + rows[i]); - } + for (let i = 0; i < rows.length; i++) { + cache_delete("article:" + rows[i]); + } - new Ajax.Request("backend.php", { - parameters: query, - onComplete: function(transport) { - handle_rpc_json(transport); - viewCurrentFeed(); - } }); + const query = {op: "rpc", method: op, ids: rows.toString()}; - } catch (e) { - exception_error("archiveSelection", e); - } + xhrPost("backend.php", query, (transport) => { + handle_rpc_json(transport); + viewCurrentFeed(); + }); } function catchupSelection() { - try { - - var rows = getSelectedArticleIds2(); - - if (rows.length == 0) { - alert(__("No articles are selected.")); - return; - } + const rows = getSelectedArticleIds2(); - var fn = getFeedName(getActiveFeedId(), activeFeedIsCat()); + if (rows.length == 0) { + alert(__("No articles are selected.")); + return; + } - var str = ngettext("Mark %d selected article in %s as read?", "Mark %d selected articles in %s as read?", rows.length); + const fn = getFeedName(getActiveFeedId(), activeFeedIsCat()); - str = str.replace("%d", rows.length); - str = str.replace("%s", fn); + let str = ngettext("Mark %d selected article in %s as read?", "Mark %d selected articles in %s as read?", rows.length); - if (getInitParam("confirm_feed_catchup") == 1 && !confirm(str)) { - return; - } + str = str.replace("%d", rows.length); + str = str.replace("%s", fn); - selectionToggleUnread(false, 'viewCurrentFeed()', true); - - } 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); - - if (dijit.byId("editTagsDlg")) - dijit.byId("editTagsDlg").destroyRecursive(); + const query = "backend.php?op=article&method=editArticleTags¶m=" + param_escape(id); - 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')); + if (dijit.byId("editTagsDlg")) + dijit.byId("editTagsDlg").destroyRecursive(); - notify_progress("Saving article tags...", true); + 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')); - new Ajax.Request("backend.php", { - parameters: query, - onComplete: function(transport) { - try { - notify(''); - dialog.hide(); + notify_progress("Saving article tags...", true); - var data = JSON.parse(transport.responseText); + xhrPost("backend.php", this.attr('value'), (transport) => { + try { + notify(''); + dialog.hide(); - if (data) { - var id = data.id; + const data = JSON.parse(transport.responseText); - console.log(id); + if (data) { + const id = data.id; - var tags = $("ATSTR-" + id); - var tooltip = dijit.byId("ATSTRTIP-" + id); + const tags = $("ATSTR-" + id); + const tooltip = dijit.byId("ATSTRTIP-" + id); - if (tags) tags.innerHTML = data.content; - if (tooltip) tooltip.attr('label', data.content_full); - } - } catch (e) { - exception_error("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) { - - // expanded cdm has a 4px margin now - ctr.scrollTop = parseInt(e.offsetTop) - 4; - } + if (force || e.offsetTop+e.offsetHeight > (ctr.scrollTop+ctr.offsetHeight) || + e.offsetTop < ctr.scrollTop) { - } catch (e) { - exception_error("cdmScrollToArticleId", e); + // expanded cdm has a 4px margin now + ctr.scrollTop = parseInt(e.offsetTop) - 4; } } function setActiveArticleId(id) { + console.log("setActiveArticleId:" + id); + _active_article_id = id; PluginHost.run(PluginHost.HOOK_ARTICLE_SET_ACTIVE, _active_article_id); } @@ -1243,57 +1005,59 @@ 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]"); - var cencw = $("CENCW-" + child.id.replace("RROW-", "")); + for (let i = 0; i < rows.length; i++) { + const row = rows[i]; - if (cencw) { - PluginHost.run(PluginHost.HOOK_ARTICLE_RENDERED_CDM, child); + if (row.offsetTop <= $("headlines-frame").scrollTop + $("headlines-frame").offsetHeight) { + console.log("unpacking: " + row.id); - cencw.innerHTML = htmlspecialchars_decode(cencw.innerHTML); - cencw.setAttribute('id', ''); - Element.show(cencw); - } - } - } - ); + const content = row.getAttribute("data-content"); - } catch (e) { - exception_error("unpackVisibleHeadlines", e); - } + row.select(".cdmContentInner")[0].innerHTML = content; + row.removeAttribute("data-content"); + + PluginHost.run(PluginHost.HOOK_ARTICLE_RENDERED_CDM, row); + } else { + break; + } + } } function headlines_scroll_handler(e) { try { - var hsp = $("headlines-spacer"); + + // rate-limit in case of smooth scrolling and similar abominations + if (Math.max(e.scrollTop, _headlines_scroll_offset) - Math.min(e.scrollTop, _headlines_scroll_offset) < 25) { + return; + } + + _headlines_scroll_offset = e.scrollTop; unpackVisibleHeadlines(); // set topmost child in the buffer as active if (isCdmMode() && getInitParam("cdm_auto_catchup") == 1 && - getSelectedArticleIds2().length <= 1 && - getInitParam("cdm_expanded")) { - var rows = $$("#headlines-frame > div[id*=RROW]"); + getSelectedArticleIds2().length <= 1) { - for (var i = 0; i < rows.length; i++) { - var child = rows[i]; + const rows = $$("#headlines-frame > div[id*=RROW]"); - if ($("headlines-frame").scrollTop <= child.offsetTop && - child.offsetTop - $("headlines-frame").scrollTop < 100 && - child.id.replace("RROW-", "") != _active_article_id) { + for (let i = 0; i < rows.length; i++) { + const row = rows[i]; + + if ($("headlines-frame").scrollTop <= row.offsetTop && + row.offsetTop - $("headlines-frame").scrollTop < 100 && + row.getAttribute("data-article-id") != _active_article_id) { if (_active_article_id) { - var row = $("RROW-" + _active_article_id); + const row = $("RROW-" + _active_article_id); if (row) row.removeClassName("active"); } - _active_article_id = child.id.replace("RROW-", ""); + _active_article_id = row.getAttribute("data-article-id"); showArticleInHeadlines(_active_article_id, true); updateSelectedPrompt(); break; @@ -1302,541 +1066,272 @@ function headlines_scroll_handler(e) { } if (!_infscroll_disable) { - if ((hsp && e.scrollTop + e.offsetHeight >= hsp.offsetTop - hsp.offsetHeight) || - (e.scrollHeight != 0 && - ((e.scrollTop + e.offsetHeight) / e.scrollHeight >= 0.7))) { + const hsp = $("headlines-spacer"); - if (hsp) - hsp.innerHTML = " " + - __("Loading, please wait..."); + if (hsp && hsp.offsetTop - 250 <= e.scrollTop + e.offsetHeight) { + + hsp.innerHTML = " " + + __("Loading, please wait...") + ""; loadMoreHeadlines(); return; } - } else { - if (hsp) hsp.innerHTML = ""; - } - - if (isCdmMode()) { - updateFloatingTitle(); - } - - 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.id.replace("RROW-", ""); - - if (catchup_id_batch.indexOf(id) == -1) - catchup_id_batch.push(id); - - //console.log("auto_catchup_batch: " + catchup_id_batch.toString()); - } - - }); - - if (catchup_id_batch.length > 0) { - window.clearTimeout(catchup_timeout_id); - - if (!_infscroll_request_sent) { - catchup_timeout_id = window.setTimeout('catchupBatchedArticles()', - 500); - } - } else if (_infscroll_disable) { - var child = $$("#headlines-frame div[id*=RROW]").last(); - - if (child && $("headlines-frame").scrollTop > - (child.offsetTop + child.offsetHeight/2)) { - - console.log("we seem to be at an end"); - - if (getInitParam("on_catchup_show_next_feed") == "1") { - var is_cat = activeFeedIsCat(); - var nuf = getNextUnreadFeed(getActiveFeedId(), is_cat); - - if (nuf) viewfeed(nuf, '', is_cat); - } - } - } - } - - } catch (e) { - console.warn("headlines_scroll_handler: " + e); - } -} - -function catchupBatchedArticles() { - try { - if (catchup_id_batch.length > 0 && !_infscroll_request_sent) { - - // 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); - - new Ajax.Request("backend.php", { - parameters: query, - onComplete: function(transport) { - handle_rpc_json(transport); - - reply = JSON.parse(transport.responseText); - var batch = reply.ids; - - batch.each(function(id) { - console.log(id); - var elem = $("RROW-" + id); - if (elem) elem.removeClassName("Unread"); - catchup_id_batch.remove(id); - }); - - 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 = getVisibleArticleIds(); - - 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; - - var row = $("RROW-" + id); - var elem = $("CICD-" + id); - - if (elem && row) { - var collapse = $$("div#RROW-" + id + - " span[class='collapseBtn']")[0]; - - Element.hide(elem); - Element.show("CEXC-" + id); - Element.hide(collapse); - - if (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); - - Element.hide("floatingTitle"); - $("floatingTitle").setAttribute("rowid", false); - } - - } catch (e) { - exception_error("cdmCollapseArticle", e); - } -} - -function cdmExpandArticle(id, noexpand) { - try { - console.log("cdmExpandArticle " + id); - - if (!$("RROW-" + id)) return false; - - var oldrow = $("RROW-" + getActiveArticleId()); - - var elem = $("CICD-" + getActiveArticleId()); - - if (id == getActiveArticleId() && Element.visible(elem)) - return true; - - selectArticles("none"); - - var old_offset = $("RROW-" + id).offsetTop; - - if (getActiveArticleId() && elem && !getInitParam("cdm_expanded")) { - var collapse = $$("div#RROW-" + getActiveArticleId() + - " span[class='collapseBtn']")[0]; - - Element.hide(elem); - Element.show("CEXC-" + getActiveArticleId()); - Element.hide(collapse); - } - - if (oldrow) oldrow.removeClassName("active"); - - setActiveArticleId(id); - - elem = $("CICD-" + id); - - var collapse = $$("div#RROW-" + id + - " span[class='collapseBtn']")[0]; - - var 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); + if (isCdmMode()) { + updateFloatingTitle(); } - var new_offset = $("RROW-" + id).offsetTop; + if (getInitParam("cdm_auto_catchup") == 1) { - if (old_offset > new_offset) - $("headlines-frame").scrollTop -= (old_offset-new_offset); + let rows = $$("#headlines-frame > div[id*=RROW][class*=Unread]"); - if (!noexpand) - toggleUnread(id, 0, true); - toggleSelected(id); - $("RROW-" + id).addClassName("active"); + for (let i = 0; i < rows.length; i++) { + const row = rows[i]; + + if ($("headlines-frame").scrollTop > (row.offsetTop + row.offsetHeight/2)) { - PluginHost.run(PluginHost.HOOK_ARTICLE_EXPANDED, id); + const id = row.getAttribute("data-article-id") - } catch (e) { - exception_error("cdmExpandArticle", e); - } + if (catchup_id_batch.indexOf(id) == -1) + catchup_id_batch.push(id); - return false; -} + //console.log("auto_catchup_batch: " + catchup_id_batch.toString()); + } else { + break; + } + } -function getArticleUnderPointer() { - return post_under_pointer; -} + if (_infscroll_disable) { + const row = $$("#headlines-frame div[id*=RROW]").last(); -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 (row && $("headlines-frame").scrollTop > + (row.offsetTop + row.offsetHeight - 50)) { + console.log("we seem to be at an end"); + + if (getInitParam("on_catchup_show_next_feed") == "1") { + openNextUnreadFeed(); + } + } + } } + } catch (e) { - exception_error("scrollArticle", e); + console.warn("headlines_scroll_handler: " + e); } } -function show_labels_in_headlines(transport) { - try { - var data = JSON.parse(transport.responseText); - - 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 openNextUnreadFeed() { + const is_cat = activeFeedIsCat(); + const nuf = getNextUnreadFeed(getActiveFeedId(), is_cat); + if (nuf) viewfeed({feed: nuf, is_cat: is_cat}); } -function dismissArticle(id) { - try { - var elem = $("RROW-" + id); +function catchupBatchedArticles() { + if (catchup_id_batch.length > 0 && !_infscroll_request_sent && !_catchup_request_sent) { - if (!elem) return; + console.log("catchupBatchedArticles, size=", catchup_id_batch.length); - toggleUnread(id, 0, true); + // make a copy of the array + const batch = catchup_id_batch.slice(); + const query = { op: "rpc", method: "catchupSelected", + cmode: 0, ids: batch.toString() }; - new Effect.Fade(elem, {duration : 0.5}); + _catchup_request_sent = true; - // Remove the content, too - var elem_content = $("CICD-" + id); - if (elem_content) { - Element.remove(elem_content); - } + xhrPost("backend.php", query, (transport) => { + const reply = handle_rpc_json(transport); - if (id == getActiveArticleId()) { - setActiveArticleId(0); - } + _catchup_request_sent = false; - } catch (e) { - exception_error("dismissArticle", e); + if (reply) { + const batch = reply.ids; + + batch.each(function (id) { + const elem = $("RROW-" + id); + if (elem) elem.removeClassName("Unread"); + catchup_id_batch.remove(id); + }); + } + + updateFloatingTitle(true); + }); } } -function dismissSelectedArticles() { - try { +function catchupRelativeToArticle(below, id) { + + if (!id) id = getActiveArticleId(); + + if (!id) { + alert(__("No article is selected.")); + return; + } - var ids = getVisibleArticleIds(); - var tmp = []; - var sel = []; + const visible_ids = getLoadedArticleIds(); - for (var i = 0; i < ids.length; i++) { - var elem = $("RROW-" + ids[i]); + const ids_to_mark = []; - if (elem.className && elem.hasClassName("Selected") && - ids[i] != getActiveArticleId()) { - new Effect.Fade(elem, {duration : 0.5}); - sel.push(ids[i]); + if (!below) { + for (var i = 0; i < visible_ids.length; i++) { + if (visible_ids[i] != id) { + var e = $("RROW-" + visible_ids[i]); - // Remove the content, too - var elem_content = $("CICD-" + ids[i]); - if (elem_content) { - Element.remove(elem_content); + if (e && e.hasClassName("Unread")) { + ids_to_mark.push(visible_ids[i]); } } else { - tmp.push(ids[i]); + break; } } + } else { + for (var i = visible_ids.length - 1; i >= 0; i--) { + if (visible_ids[i] != id) { + var e = $("RROW-" + visible_ids[i]); - if (sel.length > 0) - selectionToggleUnread(false); - - - } catch (e) { - exception_error("dismissSelectedArticles", e); + if (e && e.hasClassName("Unread")) { + ids_to_mark.push(visible_ids[i]); + } + } else { + break; + } + } } -} - -function dismissReadArticles() { - try { - var ids = getVisibleArticleIds(); - var tmp = []; + 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); - for (var i = 0; i < ids.length; i++) { - var elem = $("RROW-" + ids[i]); + if (getInitParam("confirm_feed_catchup") != 1 || confirm(msg)) { - if (elem.className && !elem.hasClassName("Unread") && - !elem.hasClassName("Selected")) { + for (var i = 0; i < ids_to_mark.length; i++) { + var e = $("RROW-" + ids_to_mark[i]); + e.removeClassName("Unread"); + } - new Effect.Fade(elem, {duration : 0.5}); + const query = { op: "rpc", method: "catchupSelected", + cmode: 0, ids: ids_to_mark.toString() }; - // Remove the content, too - var elem_content = $("CICD-" + ids[i]); - if (elem_content) { - Element.remove(elem_content); - } - } else { - tmp.push(ids[i]); - } + xhrPost("backend.php", query, (transport) => { + handle_rpc_json(transport); + }); } - - } catch (e) { - exception_error("dismissReadArticles", e); } } -function getVisibleArticleIds() { - var ids = []; - - try { +function getArticleUnderPointer() { + return post_under_pointer; +} - getLoadedArticleIds().each(function(id) { - var elem = $("RROW-" + id); - if (elem && Element.visible(elem)) - ids.push(id); - }); +function scrollArticle(offset) { + if (!isCdmMode()) { + const ci = $("content-insert"); + if (ci) { + ci.scrollTop += offset; + } + } else { + const hi = $("headlines-frame"); + if (hi) { + hi.scrollTop += offset; + } - } catch (e) { - exception_error("getVisibleArticleIds", e); } - - return ids; } -function cdmClicked(event, id) { - try { - //var shift_key = event.shiftKey; - - if (!event.ctrlKey) { +function show_labels_in_headlines(transport) { + const data = JSON.parse(transport.responseText); - if (!getInitParam("cdm_expanded")) { - return cdmExpandArticle(id); - } else { + if (data) { + data['info-for-headlines'].each(function (elem) { + $$(".HLLCTR-" + elem.id).each(function (ctr) { + ctr.innerHTML = elem.labels; + }); + }); + } +} - var elem = $("RROW-" + getActiveArticleId()); +function cdmClicked(event, id, in_body) { + //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) { - toggleSelected(id, true); - toggleUnread(id, 0, false); - openArticleInNewWindow(id); - return false; - } else { - view(id); - return false; - } - - } catch (e) { - exception_error("hlClicked"); + if (event.which == 2) { + view(id); + return true; + } else if (event.ctrlKey || event.metaKey) { + openArticleInNewWindow(id); + return false; + } else { + view(id); + return false; } } -function getFirstVisibleHeadlineId() { - var rows = getVisibleArticleIds(); - return rows[0]; - -} - -function getLastVisibleHeadlineId() { - var rows = getVisibleArticleIds(); - return rows[rows.length-1]; -} - 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() { @@ -1846,9 +1341,9 @@ function isCdmMode() { 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) { @@ -1864,26 +1359,20 @@ function markHeadline(id, marked) { function getRelativePostIds(id, limit) { - var tmp = []; + const tmp = []; - try { - - if (!limit) limit = 6; //3 + if (!limit) limit = 6; //3 - var ids = getVisibleArticleIds(); + 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; @@ -1891,44 +1380,33 @@ function getRelativePostIds(id, limit) { function correctHeadlinesOffset(id) { - try { - - var container = $("headlines-frame"); - var row = $("RROW-" + id); + const container = $("headlines-frame"); + const 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); + //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) { + 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 */ + /* doesn't properly work with Opera in some cases because + Opera fucks up element scrolling */ - container.scrollTop = row.offsetTop + row.offsetHeight - viewport; - } - - } catch (e) { - exception_error("correctHeadlinesOffset", e); + 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() { @@ -1939,259 +1417,209 @@ function closeArticlePanel() { } function initFloatingMenu() { - try { - if (dijit.byId("floatingMenu")) - dijit.byId("floatingMenu").destroyRecursive(); + if (!dijit.byId("floatingMenu")) { - var menu = new dijit.Menu({ - id: "floatingMenu", - targetNodeIds: ["floatingTitle"] - }); - - var id = $("floatingTitle").getAttribute("rowid").replace("RROW-", ""); + const menu = new dijit.Menu({ + id: "floatingMenu", + targetNodeIds: ["floatingTitle"] + }); - headlinesMenuCommon(menu, id); + headlinesMenuCommon(menu); - menu.startup(); - } catch (e) { - exception_error("initFloatingMenu", e); + menu.startup(); } } -function headlinesMenuCommon(menu, base_id) { - try { - - menu.addChild(new dijit.MenuItem({ - label: __("Open original article"), - onClick: function(event) { - openArticleInNewWindow(base_id ? base_id : this.getParent().callerRowId); - }})); +function headlinesMenuCommon(menu) { - menu.addChild(new dijit.MenuItem({ - label: __("Display article URL"), - onClick: function(event) { - displayArticleUrl(base_id ? base_id : 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 = (base_id ? base_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 = (base_id ? base_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 = (base_id ? base_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, base_id ? base_id : this.getParent().callerRowId); - }})); + selectionTogglePublished(undefined, false, true, ids); + } + })); - menu.addChild(new dijit.MenuItem({ - label: __("Mark below as read"), - onClick: function(event) { - catchupRelativeToArticle(1, base_id ? base_id : 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 = (base_id ? base_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 = (base_id ? base_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(); - - 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); - }); + if (!dijit.byId("headlinesMenu")) { - 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.id.match("^[A-Z]+[-]([0-9]+)$"); - callerNode = callerNode.parentNode; - ++tries; - } - - if (match) this.callerRowId = parseInt(match[1]); - + targetNodeIds: ["headlines-frame"], + selector: ".hlMenuAttach" }); - headlinesMenuCommon(menu, false); + 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) { - console.log(callerNode.id); - - match = callerNode.id.match("^[A-Z]+[-]([0-9]+)$"); - callerNode = callerNode.parentNode; - ++tries; - - console.log(match[1]); - } - - if (match) this.callerRowId = parseInt(match[1]); - - }); - - menu.addChild(new dijit.MenuItem({ - label: __("Select articles in group"), - onClick: function(event) { - selectArticles("all", - "#headlines-frame > div[id*=RROW]"+ - "[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]"+ - "[orig-feed-id='"+menu.callerRowId+"']"); + 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") + "']"); - catchupSelection(); - }})); + } + })); + 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: __("Mark feed as read"), - onClick: function(event) { - catchupFeedInGroup(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(); } } @@ -2221,180 +1649,154 @@ 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); - - var score = prompt(__("Please enter new score for selected articles:"), score); - - if (score != undefined) { - var query = "op=article&method=setScore&id=" + param_escape(ids.toString()) + - "&score=" + param_escape(score); - - new Ajax.Request("backend.php", { - parameters: query, - onComplete: function(transport) { - var reply = JSON.parse(transport.responseText); - if (reply) { - console.log(ids); - - ids.each(function(id) { - var row = $("RROW-" + id); - - if (row) { - var pic = row.getElementsByClassName("hlScorePic")[0]; - - if (pic) { - pic.src = pic.src.replace(/score_.*?\.png/, - reply["score_pic"]); - pic.setAttribute("score", score); - } - } - }); - } - } }); - } + const ids = getSelectedArticleIds2(); - } else { - alert(__("No articles are selected.")); + if (ids.length > 0) { + console.log(ids); + + const score = prompt(__("Please enter new score for selected articles:")); + + if (score != undefined) { + const query = { op: "article", method: "setScore", id: ids.toString(), + score: score }; + + xhrJson("backend.php", query, (reply) => { + if (reply) { + reply.id.each((id) => { + const row = $("RROW-" + id); + + if (row) { + const pic = row.getElementsByClassName("hlScorePic")[0]; + + if (pic) { + pic.src = pic.src.replace(/score_.*?\.png/, + reply["score_pic"]); + pic.setAttribute("score", reply["score"]); + } + } + }); + } + }); } - } catch (e) { - exception_error("setSelectionScore", e); + + } else { + alert(__("No articles are selected.")); } } -function changeScore(id, pic) { - try { - var score = pic.getAttribute("score"); +/* +function updateScore(id) { + const pic = $$("#RROW-" + id + " .hlScorePic")[0]; - var new_score = prompt(__("Please enter new score for this article:"), score); + if (pic) { - if (new_score != undefined) { + const query = "op=article&method=getScore&id=" + param_escape(id); - var query = "op=article&method=setScore&id=" + param_escape(id) + - "&score=" + param_escape(new_score); + new Ajax.Request("backend.php", { + parameters: query, + onComplete: function (transport) { + console.log(transport.responseText); - new Ajax.Request("backend.php", { - parameters: query, - onComplete: function(transport) { - var reply = JSON.parse(transport.responseText); + const reply = JSON.parse(transport.responseText); - if (reply) { - pic.src = pic.src.replace(/score_.*?\.png/, reply["score_pic"]); - pic.setAttribute("score", new_score); - } - } }); - } - } catch (e) { - exception_error("changeScore", e); + if (reply) { + pic.src = pic.src.replace(/score_.*?\.png/, reply["score_pic"]); + pic.setAttribute("score", reply["score"]); + pic.setAttribute("title", reply["score"]); + } + } + }); } -} +} */ -function displayArticleUrl(id) { - try { - var query = "op=rpc&method=getlinktitlebyid&id=" + param_escape(id); +function changeScore(id, pic) { + const score = pic.getAttribute("score"); - new Ajax.Request("backend.php", { - parameters: query, - onComplete: function(transport) { - var reply = JSON.parse(transport.responseText); + const new_score = prompt(__("Please enter new score for this article:"), score); - if (reply && reply.link) { - prompt(__("Article URL:"), reply.link); - } - } }); - } catch (e) { - exception_error("changeScore", e); + if (new_score != undefined) { + const query = { op: "article", method: "setScore", id: id, score: new_score }; + + xhrJson("backend.php", query, (reply) => { + if (reply) { + pic.src = pic.src.replace(/score_.*?\.png/, reply["score_pic"]); + pic.setAttribute("score", new_score); + pic.setAttribute("title", new_score); + } + }); } } -function openSelectedAttachment(elem) { - try { - var url = elem[elem.selectedIndex].value; +function displayArticleUrl(id) { + const query = { op: "rpc", method: "getlinktitlebyid", id: id }; - if (url) { - window.open(url); - elem.selectedIndex = 0; - } + xhrJson("backend.php", query, (reply) => { + if (reply && reply.link) { + prompt(__("Article URL:"), reply.link); + } + }); - } catch (e) { - exception_error("openSelectedAttachment", e); - } } function scrollToRowId(id) { - try { - var row = $(id); - - if (row) - $("headlines-frame").scrollTop = row.offsetTop; + 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"); - for (var i = 0; i < elems.length; i++) { + const elems = $$("#headlines-frame > div[id*=RROW]"); - var child = elems[i]; + for (let i = 0; i < elems.length; i++) { - if (child && child.offsetTop + child.offsetHeight > hf.scrollTop) { + const child = elems[i]; - var header = child.getElementsByClassName("cdmHeader")[0]; + if (child && child.offsetTop + child.offsetHeight > hf.scrollTop) { - if (unread_only || child.id != $("floatingTitle").getAttribute("rowid")) { - if (child.id != $("floatingTitle").getAttribute("rowid")) { - $("floatingTitle").setAttribute("rowid", child.id); - $("floatingTitle").innerHTML = header.innerHTML; - $("floatingTitle").firstChild.innerHTML = "" + $("floatingTitle").firstChild.innerHTML; + const header = child.getElementsByClassName("cdmHeader")[0]; - initFloatingMenu(); + if (unread_only || child.getAttribute("data-article-id") != $("floatingTitle").getAttribute("data-article-id")) { + if (child.getAttribute("data-article-id") != $("floatingTitle").getAttribute("data-article-id")) { - var cb = $$("#floatingTitle .dijitCheckBox")[0]; + $("floatingTitle").setAttribute("data-article-id", child.getAttribute("data-article-id")); + $("floatingTitle").innerHTML = header.innerHTML; + $("floatingTitle").firstChild.innerHTML = "" + $("floatingTitle").firstChild.innerHTML; - if (cb) - cb.parentNode.removeChild(cb); - } + initFloatingMenu(); - if (child.hasClassName("Unread")) - $("floatingTitle").addClassName("Unread"); - else - $("floatingTitle").removeClassName("Unread"); + const cb = $$("#floatingTitle .dijitCheckBox")[0]; - PluginHost.run(PluginHost.HOOK_FLOATING_TITLE, child); + if (cb) + cb.parentNode.removeChild(cb); } - if (child.offsetTop < hf.scrollTop - header.offsetHeight && - child.offsetTop + child.offsetHeight - hf.scrollTop > header.offsetHeight) - Element.show("floatingTitle"); + if (child.hasClassName("Unread")) + $("floatingTitle").addClassName("Unread"); else - Element.hide("floatingTitle"); - - 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"; + + return; + + } } }