X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;ds=sidebyside;f=js%2Fviewfeed.js;h=95e55050d9ce4b2441eba0036e2f6caa26267e7b;hb=e2b8c9273e09091c235959c25d8e4d8122aa6ca8;hp=3aaea99b938b189b68ef7f3608e636bf8e141e77;hpb=22adcd7466777d21d7d642647831761d90ea289a;p=tt-rss.git
diff --git a/js/viewfeed.js b/js/viewfeed.js
index 3aaea99b..95e55050 100755
--- a/js/viewfeed.js
+++ b/js/viewfeed.js
@@ -1,39 +1,36 @@
-var _active_article_id = 0;
+/* global dijit, __ */
-var vgroup_last_feed = false;
-var post_under_pointer = false;
+let _active_article_id = 0;
-var last_requested_article = false;
+let vgroup_last_feed = false;
+let post_under_pointer = false;
-var catchup_id_batch = [];
-var catchup_timeout_id = false;
+let last_requested_article = 0;
-var cids_requested = [];
-var loaded_article_ids = [];
-var _last_headlines_update = 0;
-var _headlines_scroll_offset = 0;
-var current_first_id = 0;
-var last_search_query;
+let catchup_id_batch = [];
+//let catchup_timeout_id = false;
-var _catchup_request_sent = false;
+//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) {
- handle_rpc_json(transport);
+ const reply = handle_rpc_json(transport);
console.log("headlines_callback2 [offset=" + offset + "] B:" + background + " I:" + infscroll_req);
- var is_cat = false;
- var feed_id = false;
-
- var reply = false;
+ if (background)
+ return;
- try {
- reply = JSON.parse(transport.responseText);
- } catch (e) {
- console.error(e);
- }
+ let is_cat = false;
+ let feed_id = false;
if (reply) {
@@ -41,20 +38,9 @@ function headlines_callback2(transport, offset, background, infscroll_req) {
feed_id = reply['headlines']['id'];
last_search_query = reply['headlines']['search_query'];
- if (background) {
- var content = reply['headlines']['content'];
-
- content = content + "
";
- return;
- }
-
if (feed_id != -7 && (feed_id != getActiveFeedId() || is_cat != activeFeedIsCat()))
return;
- /* dijit.getEnclosingWidget(
- document.forms["main_toolbar_form"].update).attr('disabled',
- is_cat || feed_id <= 0); */
-
try {
if (infscroll_req == false) {
$("headlines-frame").scrollTop = 0;
@@ -63,14 +49,14 @@ function headlines_callback2(transport, offset, background, infscroll_req) {
$("floatingTitle").setAttribute("data-article-id", 0);
$("floatingTitle").innerHTML = "";
}
- } catch (e) { };
+ } catch (e) { }
$("headlines-frame").removeClassName("cdm");
$("headlines-frame").removeClassName("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'];
@@ -81,9 +67,8 @@ function headlines_callback2(transport, offset, background, infscroll_req) {
}
current_first_id = reply['headlines']['first_id'];
- var counters = reply['counters'];
- var articles = reply['articles'];
- //var runtime_info = reply['runtime-info'];
+ const counters = reply['counters'];
+ const articles = reply['articles'];
if (infscroll_req == false) {
loaded_article_ids = [];
@@ -92,31 +77,23 @@ function headlines_callback2(transport, offset, background, infscroll_req) {
reply['headlines']['toolbar'],
{parseContent: true});
- /*dojo.html.set($("headlines-frame"),
- reply['headlines']['content'],
- {parseContent: true});
-
- $$("#headlines-frame div[id*='RROW']").each(function(row) {
- loaded_article_ids.push(row.id);
- });*/
-
$("headlines-frame").innerHTML = '';
- var tmp = new Element("div");
+ let tmp = document.createElement("div");
tmp.innerHTML = reply['headlines']['content'];
dojo.parser.parse(tmp);
while (tmp.hasChildNodes()) {
var row = tmp.removeChild(tmp.firstChild);
- if (loaded_article_ids.indexOf(row.id) == -1 || row.hasClassName("cdmFeedTitle")) {
+ if (loaded_article_ids.indexOf(row.id) == -1 || row.hasClassName("feed-title")) {
dijit.byId("headlines-frame").domNode.appendChild(row);
loaded_article_ids.push(row.id);
}
}
- var hsp = $("headlines-spacer");
+ let hsp = $("headlines-spacer");
if (!hsp) hsp = new Element("DIV", {"id": "headlines-spacer"});
dijit.byId('headlines-frame').domNode.appendChild(hsp);
@@ -132,87 +109,70 @@ function headlines_callback2(transport, offset, background, infscroll_req) {
"";
}
- } else {
+ } else if (headlines_count > 0 && feed_id == getActiveFeedId() && is_cat == activeFeedIsCat()) {
+ console.log("adding some more headlines: " + headlines_count);
- if (headlines_count > 0 && feed_id == getActiveFeedId() && is_cat == activeFeedIsCat()) {
- console.log("adding some more headlines: " + headlines_count);
+ const c = dijit.byId("headlines-frame");
+ //const ids = getSelectedArticleIds2();
- var c = dijit.byId("headlines-frame");
- var ids = getSelectedArticleIds2();
+ let hsp = $("headlines-spacer");
- var hsp = $("headlines-spacer");
+ if (hsp)
+ c.domNode.removeChild(hsp);
- if (hsp)
- c.domNode.removeChild(hsp);
-
- var tmp = new Element("div");
- tmp.innerHTML = reply['headlines']['content'];
- dojo.parser.parse(tmp);
+ let tmp = document.createElement("div");
+ tmp.innerHTML = reply['headlines']['content'];
+ dojo.parser.parse(tmp);
- while (tmp.hasChildNodes()) {
- var row = tmp.removeChild(tmp.firstChild);
+ while (tmp.hasChildNodes()) {
+ let row = tmp.removeChild(tmp.firstChild);
- if (loaded_article_ids.indexOf(row.id) == -1 || row.hasClassName("cdmFeedTitle")) {
- dijit.byId("headlines-frame").domNode.appendChild(row);
+ if (loaded_article_ids.indexOf(row.id) == -1 || row.hasClassName("feed-title")) {
+ dijit.byId("headlines-frame").domNode.appendChild(row);
- loaded_article_ids.push(row.id);
- }
+ loaded_article_ids.push(row.id);
}
+ }
- if (!hsp) hsp = new Element("DIV", {"id": "headlines-spacer"});
- c.domNode.appendChild(hsp);
-
- if (headlines_count < 30) _infscroll_disable = true;
+ if (!hsp) hsp = new Element("DIV", {"id": "headlines-spacer"});
+ c.domNode.appendChild(hsp);
- console.log("restore selected ids: " + ids);
+ if (headlines_count < 30) _infscroll_disable = true;
- for (var i = 0; i < ids.length; i++) {
- markHeadline(ids[i]);
- }
+ /* console.log("restore selected ids: " + ids);
- initHeadlinesMenu();
+ for (let i = 0; i < ids.length; i++) {
+ markHeadline(ids[i]);
+ } */
- if (_infscroll_disable) {
- hsp.innerHTML = "" +
- __("Click to open next unread feed.") + "";
- }
+ initHeadlinesMenu();
- } else {
- console.log("no new headlines received");
+ if (_infscroll_disable) {
+ hsp.innerHTML = "" +
+ __("Click to open next unread feed.") + "";
+ }
- var first_id_changed = reply['headlines']['first_id_changed'];
- console.log("first id changed:" + first_id_changed);
+ } else {
+ console.log("no new headlines received");
- var hsp = $("headlines-spacer");
+ const first_id_changed = reply['headlines']['first_id_changed'];
+ console.log("first id changed:" + first_id_changed);
- if (hsp) {
- if (first_id_changed) {
- hsp.innerHTML = "" +
- __("New articles found, reload feed to continue.") + "";
- } else {
- hsp.innerHTML = "" +
- __("Click to open next unread feed.") + "";
- }
+ let hsp = $("headlines-spacer");
+ if (hsp) {
+ if (first_id_changed) {
+ hsp.innerHTML = "" +
+ __("New articles found, reload feed to continue.") + "";
+ } else {
+ hsp.innerHTML = "" +
+ __("Click to open next unread feed.") + "";
}
}
- }
- if (articles) {
- for (var i = 0; i < articles.length; i++) {
- 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();
-
} else {
console.error("Invalid object received: " + transport.responseText);
dijit.byId("headlines-frame").attr('content', "" +
@@ -244,11 +204,11 @@ function render_article(article) {
dijit.byId("headlines-wrap-inner").addChild(
dijit.byId("content-insert"));
- var c = dijit.byId("content-insert");
+ const c = dijit.byId("content-insert");
try {
c.domNode.scrollTop = 0;
- } catch (e) { };
+ } catch (e) { }
c.attr('content', article);
PluginHost.run(PluginHost.HOOK_ARTICLE_RENDERED, c.domNode);
@@ -257,11 +217,12 @@ function render_article(article) {
try {
c.focus();
- } catch (e) { };
+ } catch (e) { }
}
+/*
function showArticleInHeadlines(id, noexpand) {
- var row = $("RROW-" + id);
+ const row = $("RROW-" + id);
if (!row) return;
if (!noexpand)
@@ -277,15 +238,7 @@ function showArticleInHeadlines(id, noexpand) {
function article_callback2(transport, id) {
console.log("article_callback2 " + id);
- handle_rpc_json(transport);
-
- var reply = false;
-
- try {
- reply = JSON.parse(transport.responseText);
- } catch (e) {
- console.error(e);
- }
+ const reply = handle_rpc_json(transport);
if (reply) {
@@ -298,11 +251,6 @@ function article_callback2(transport, id) {
cache_set("article:" + article['id'], article['content']);
});
-// if (id != last_requested_article) {
-// console.log("requested article id is out of sequence, aborting");
-// return;
-// }
-
} else {
console.error("Invalid object received: " + transport.responseText);
@@ -310,17 +258,75 @@ function article_callback2(transport, id) {
__('Could not display article (invalid object received - see error console for details)') + "
");
}
- var unread_in_buffer = $$("#headlines-frame > div[id*=RROW][class*=Unread]").length
+ const unread_in_buffer = $$("#headlines-frame > div[id*=RROW][class*=Unread]").length;
request_counters(unread_in_buffer == 0);
notify("");
}
+*/
+function view(id, noexpand) {
+ setActiveArticleId(id);
+
+ if (!noexpand) {
+ console.log("loading article", id);
+
+ const neighbor_ids = getRelativePostIds(id);
+ const cids = [];
-function view(id, activefeed, noexpand) {
- var oldrow = $("RROW-" + getActiveArticleId());
+ /* only request uncached articles */
+
+ neighbor_ids.each((n) => {
+ if (!cache_get("article:" + n))
+ cids.push(n);
+ });
+
+ const cached_article = cache_get("article:" + id);
+
+ if (cached_article) {
+ console.log('rendering cached', id);
+ render_article(cached_article);
+ return false;
+ }
+
+ xhrPost("backend.php", {op: "article", method: "view", id: id, cids: cids.toString()}, (transport) => {
+ try {
+ const reply = handle_rpc_json(transport);
+
+ if (reply) {
+
+ reply.each(function(article) {
+ if (getActiveArticleId() == article['id']) {
+ render_article(article['content']);
+ }
+ //cids_requested.remove(article['id']);
+
+ cache_set("article:" + article['id'], article['content']);
+ });
+
+ } else {
+ console.error("Invalid object received: " + transport.responseText);
+
+ render_article("" +
+ __('Could not display article (invalid object received - see error console for details)') + "
");
+ }
+
+ //const unread_in_buffer = $$("#headlines-frame > div[id*=RROW][class*=Unread]").length;
+ //request_counters(unread_in_buffer == 0);
+
+ notify("");
+
+ } catch (e) {
+ exception_error(e);
+ }
+ })
+ }
+
+ return false;
+
+/* const oldrow = $("RROW-" + getActiveArticleId());
if (oldrow) oldrow.removeClassName("active");
- var crow = $("RROW-" + id);
+ const crow = $("RROW-" + id);
if (!crow) return;
if (noexpand) {
@@ -331,19 +337,19 @@ function view(id, activefeed, noexpand) {
console.log("loading article: " + id);
- var cached_article = cache_get("article:" + id);
+ const cached_article = cache_get("article:" + id);
console.log("cache check result: " + (cached_article != false));
- var query = "?op=article&method=view&id=" + param_escape(id);
+ const query = {op: "article", method: "view", id: id};
- var neighbor_ids = getRelativePostIds(id);
+ const neighbor_ids = getRelativePostIds(id);
/* only request uncached articles */
- var cids_to_request = [];
+/* const cids_to_request = [];
- for (var i = 0; i < neighbor_ids.length; i++) {
+ 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]);
@@ -353,22 +359,18 @@ function view(id, activefeed, noexpand) {
console.log("additional ids: " + cids_to_request.toString());
- query = query + "&cids=" + cids_to_request.toString();
+ query.cids = cids_to_request.toString();
- var article_is_unread = crow.hasClassName("Unread");
+ const article_is_unread = crow.hasClassName("Unread");
setActiveArticleId(id);
showArticleInHeadlines(id);
if (cached_article && article_is_unread) {
-
- query = query + "&mode=prefetch";
-
+ query.mode = "prefetch";
render_article(cached_article);
-
} else if (cached_article) {
-
- query = query + "&mode=prefetch_old";
+ query.mode = "prefetch_old";
render_article(cached_article);
// if we don't need to request any relative ids, we might as well skip
@@ -386,103 +388,93 @@ function view(id, activefeed, noexpand) {
decrementFeedCounter(getActiveFeedId(), activeFeedIsCat());
}
- new Ajax.Request("backend.php", {
- parameters: query,
- onComplete: function(transport) {
- article_callback2(transport, id);
- } });
+ xhrPost("backend.php", query, (transport) => {
+ article_callback2(transport, id);
+ })
return false;
-
+*/
}
function toggleMark(id, client_only) {
- var query = "?op=rpc&id=" + id + "&method=mark";
+ const query = { op: "rpc", id: id, method: "mark" };
- var row = $("RROW-" + id);
+ 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++)
+ 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");
+ const fte = ft.getElementsByClassName("markedPic");
for (var i = 0; i < fte.length; i++)
imgs.push(fte[i]);
}
for (i = 0; i < imgs.length; i++) {
- var img = imgs[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";
+ query.mark = 1;
} else {
img.src = img.src.replace("mark_set", "mark_unset");
- img.alt = __("Star article");
- query = query + "&mark=0";
+ query.mark = 0;
}
}
row.toggleClassName("marked");
- if (!client_only) {
- new Ajax.Request("backend.php", {
- parameters: query,
- onComplete: function (transport) {
- handle_rpc_json(transport);
- }
+ if (!client_only)
+ xhrPost("backend.php", query, (transport) => {
+ handle_rpc_json(transport);
});
}
-}
function togglePub(id, client_only, no_effects, note) {
- 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);
+ query.note = note;
} else {
- query = query + "¬e=undefined";
+ query.note = "undefined";
}
- var row = $("RROW-" + id);
+ 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++)
+ 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");
+ const fte = ft.getElementsByClassName("pubPic");
- for (var i = 0; i < fte.length; i++)
+ for (let i = 0; i < fte.length; i++)
imgs.push(fte[i]);
}
- for (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";
+ query.pub = 1;
} else {
img.src = img.src.replace("pub_set", "pub_unset");
- img.alt = __("Publish article");
- query = query + "&pub=0";
+ query.pub = 0;
}
}
@@ -491,21 +483,17 @@ function togglePub(id, client_only, no_effects, note) {
else
row.toggleClassName("published");
- if (!client_only) {
- new Ajax.Request("backend.php", {
- parameters: query,
- onComplete: function(transport) {
+ if (!client_only)
+ xhrPost("backend.php", query, (transport) => {
handle_rpc_json(transport);
- } });
- }
-
+ });
}
function moveToPost(mode, noscroll, noexpand) {
- var rows = getLoadedArticleIds();
+ const rows = getLoadedArticleIds();
- var prev_id = false;
- var next_id = false;
+ let prev_id = false;
+ let next_id = false;
if (!$('RROW-' + getActiveArticleId())) {
setActiveArticleId(0);
@@ -515,13 +503,13 @@ function moveToPost(mode, noscroll, noexpand) {
next_id = rows[0];
prev_id = rows[rows.length-1]
} else {
- for (var i = 0; i < rows.length; i++) {
+ 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];
- for (var j = i+1; j < rows.length; j++) {
+ for (let j = i+1; j < rows.length; j++) {
if (rows[j] != getActiveArticleId()) {
next_id = rows[j];
break;
@@ -538,8 +526,8 @@ function moveToPost(mode, noscroll, noexpand) {
if (next_id || getActiveArticleId()) {
if (isCdmMode()) {
- var article = $("RROW-" + getActiveArticleId());
- var ctr = $("headlines-frame");
+ const article = $("RROW-" + getActiveArticleId());
+ const ctr = $("headlines-frame");
if (!noscroll && article && article.offsetTop + article.offsetHeight >
ctr.scrollTop + ctr.offsetHeight) {
@@ -547,13 +535,13 @@ function moveToPost(mode, noscroll, noexpand) {
scrollArticle(ctr.offsetHeight/4);
} else if (next_id) {
- cdmExpandArticle(next_id, noexpand);
cdmScrollToArticleId(next_id, true);
+ setActiveArticleId(next_id);
}
} else if (next_id) {
correctHeadlinesOffset(next_id);
- view(next_id, getActiveFeedId(), noexpand);
+ view(next_id, noexpand);
}
}
}
@@ -562,46 +550,34 @@ function moveToPost(mode, noscroll, noexpand) {
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 (!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) {
+ cdmScrollToArticleId(prev_id, noscroll);
+ setActiveArticleId(prev_id);
}
} else if (prev_id) {
correctHeadlinesOffset(prev_id);
- view(prev_id, getActiveFeedId(), noexpand);
+ view(prev_id, noexpand);
}
}
}
}
-function toggleSelected(id, force_on) {
- var row = $("RROW-" + id);
+/* function toggleSelected(id, force_on) {
+ const row = $("RROW-" + id);
if (row) {
- var cb = dijit.getEnclosingWidget(
+ const cb = dijit.getEnclosingWidget(
row.getElementsByClassName("rchk")[0]);
if (row.hasClassName('Selected') && !force_on) {
@@ -614,11 +590,11 @@ function toggleSelected(id, force_on) {
}
updateSelectedPrompt();
-}
+} */
function updateSelectedPrompt() {
- var count = getSelectedArticleIds2().size();
- var elem = $("selected_prompt");
+ const count = getSelectedArticleIds2().length;
+ const elem = $("selected_prompt");
if (elem) {
elem.innerHTML = ngettext("%d article selected",
@@ -632,10 +608,11 @@ function updateSelectedPrompt() {
}
-function toggleUnread(id, cmode, effect) {
- var row = $("RROW-" + id);
+function toggleUnread(id, cmode) {
+ const row = $("RROW-" + id);
+
if (row) {
- var tmpClassName = row.className;
+ const tmpClassName = row.className;
if (cmode == undefined || cmode == 2) {
if (row.hasClassName("Unread")) {
@@ -646,29 +623,21 @@ function toggleUnread(id, cmode, effect) {
}
} else if (cmode == 0) {
-
row.removeClassName("Unread");
-
} else if (cmode == 1) {
row.addClassName("Unread");
}
- if (cmode == undefined) cmode = 2;
-
- 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};
- if (tmpClassName != row.className) {
- new Ajax.Request("backend.php", {
- parameters: query,
- onComplete: function (transport) {
- handle_rpc_json(transport);
- }
+ xhrPost("backend.php", query, (transport) => {
+ handle_rpc_json(transport);
});
}
-
}
}
@@ -680,18 +649,13 @@ function selectionRemoveLabel(id, ids) {
return;
}
- var query = "?op=article&method=removeFromLabel&ids=" +
- param_escape(ids.toString()) + "&lid=" + param_escape(id);
-
- console.log(query);
-
- new Ajax.Request("backend.php", {
- parameters: query,
- onComplete: function(transport) {
- handle_rpc_json(transport);
- show_labels_in_headlines(transport);
- } });
+ const query = { op: "article", method: "removeFromLabel",
+ ids: ids.toString(), lid: id };
+ xhrPost("backend.php", query, (transport) => {
+ handle_rpc_json(transport);
+ show_labels_in_headlines(transport);
+ });
}
function selectionAssignLabel(id, ids) {
@@ -702,29 +666,25 @@ function selectionAssignLabel(id, ids) {
return;
}
- var query = "?op=article&method=assignToLabel&ids=" +
- param_escape(ids.toString()) + "&lid=" + param_escape(id);
-
- console.log(query);
+ const query = { op: "article", method: "assignToLabel",
+ ids: ids.toString(), lid: id };
- new Ajax.Request("backend.php", {
- parameters: query,
- onComplete: function(transport) {
- handle_rpc_json(transport);
- show_labels_in_headlines(transport);
- } });
+ xhrPost("backend.php", query, (transport) => {
+ handle_rpc_json(transport);
+ show_labels_in_headlines(transport);
+ });
}
function selectionToggleUnread(set_state, callback, no_error, ids) {
- 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]);
+ for (let i = 0; i < rows.length; i++) {
+ const row = $("RROW-" + rows[i]);
if (row) {
if (set_state == undefined) {
if (row.hasClassName("Unread")) {
@@ -748,7 +708,7 @@ function selectionToggleUnread(set_state, callback, no_error, ids) {
if (rows.length > 0) {
- var cmode = "";
+ let cmode = "";
if (set_state == undefined) {
cmode = "2";
@@ -758,92 +718,88 @@ function selectionToggleUnread(set_state, callback, no_error, ids) {
cmode = "0";
}
- var query = "?op=rpc&method=catchupSelected" +
- "&cmode=" + cmode + "&ids=" + param_escape(rows.toString());
+ const query = {op: "rpc", method: "catchupSelected",
+ cmode: cmode, ids: rows.toString() };
notify_progress("Loading, please wait...");
- new Ajax.Request("backend.php", {
- parameters: query,
- onComplete: function(transport) {
- handle_rpc_json(transport);
- if (callback) callback(transport);
- } });
+ xhrPost("backend.php", query, (transport) => {
+ handle_rpc_json(transport);
+ if (callback) callback(transport);
+ });
}
}
// sel_state ignored
function selectionToggleMarked(sel_state, callback, no_error, ids) {
- 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++) {
+ 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 };
- var query = "?op=rpc&method=markSelected&ids=" +
- param_escape(rows.toString()) + "&cmode=2";
-
- new Ajax.Request("backend.php", {
- parameters: query,
- onComplete: function(transport) {
- handle_rpc_json(transport);
- if (callback) callback(transport);
- } });
-
+ xhrPost("backend.php", query, (transport) => {
+ handle_rpc_json(transport);
+ if (callback) callback(transport);
+ });
}
}
// sel_state ignored
function selectionTogglePublished(sel_state, callback, no_error, ids) {
- 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++) {
+ 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 };
- var query = "?op=rpc&method=publishSelected&ids=" +
- param_escape(rows.toString()) + "&cmode=2";
-
- new Ajax.Request("backend.php", {
- parameters: query,
- onComplete: function(transport) {
- handle_rpc_json(transport);
- } });
-
+ xhrPost("backend.php", query, (transport) => {
+ handle_rpc_json(transport);
+ if (callback) callback(transport);
+ });
}
}
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)) {
@@ -856,15 +812,70 @@ function getLoadedArticleIds() {
}
// mode = all,none,unread,invert,marked,published
-function selectArticles(mode, query) {
+function selectArticles(mode) {
+ let query = "#headlines-frame > div[id*=RROW]";
+
+ switch (mode) {
+ case "none":
+ case "all":
+ case "invert":
+ break;
+ case "marked":
+ query += "[class*=marked]";
+ break;
+ case "published":
+ query += "[class*=published]";
+ break;
+ case "unread":
+ query += "[class*=Unread]";
+ break;
+ default:
+ console.warn("selectArticles: unknown mode", mode);
+ }
+
+ const rows = $$(query);
+
+ for (let i = 0; i < rows.length; i++) {
+ const row = rows[i];
+ const cb = dijit.getEnclosingWidget(row.select(".rchk")[0]);
+
+ switch (mode) {
+ case "none":
+ row.removeClassName("Selected");
+
+ if (!row.hasClassName("active"))
+ cb.attr("checked", false);
+ break;
+ case "invert":
+ if (row.hasClassName("Selected")) {
+ row.removeClassName("Selected");
+
+ if (!row.hasClassName("active"))
+ cb.attr("checked", false);
+ } else {
+ row.addClassName("Selected");
+ cb.attr("checked", true);
+ }
+ break;
+ default:
+ row.addClassName("Selected");
+ cb.attr("checked", true);
+ }
+
+ updateSelectedPrompt();
+ }
+}
+
+// mode = all,none,unread,invert,marked,published
+/* function selectArticles(mode, query) {
if (!query) query = "#headlines-frame > div[id*=RROW]";
- var children = $$(query);
+ const children = $$(query);
children.each(function(child) {
- var id = child.getAttribute("data-article-id");
+ //const id = child.getAttribute("data-article-id");
- var cb = dijit.getEnclosingWidget(
+ const cb = dijit.getEnclosingWidget(
child.getElementsByClassName("rchk")[0]);
if (mode == "all") {
@@ -911,19 +922,19 @@ function selectArticles(mode, query) {
});
updateSelectedPrompt();
-}
+} */
function deleteSelection() {
- var rows = getSelectedArticleIds2();
+ const rows = getSelectedArticleIds2();
if (rows.length == 0) {
alert(__("No articles are selected."));
return;
}
- var fn = getFeedName(getActiveFeedId(), activeFeedIsCat());
- var str;
+ const fn = getFeedName(getActiveFeedId(), activeFeedIsCat());
+ let str;
if (getActiveFeedId() != 0) {
str = ngettext("Delete %d selected article in %s?", "Delete %d selected articles in %s?", rows.length);
@@ -938,31 +949,26 @@ function deleteSelection() {
return;
}
- query = "?op=rpc&method=delete&ids=" + param_escape(rows);
+ const query = { op: "rpc", method: "delete", ids: rows.toString() };
- console.log(query);
-
- new Ajax.Request("backend.php", {
- parameters: query,
- onComplete: function (transport) {
- handle_rpc_json(transport);
- viewCurrentFeed();
- }
+ xhrPost("backend.php", query, (transport) => {
+ handle_rpc_json(transport);
+ viewCurrentFeed();
});
}
function archiveSelection() {
- var rows = getSelectedArticleIds2();
+ const rows = getSelectedArticleIds2();
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);
@@ -982,35 +988,30 @@ function archiveSelection() {
return;
}
- query = "?op=rpc&method="+op+"&ids=" + param_escape(rows);
-
- console.log(query);
-
- for (var i = 0; i < rows.length; i++) {
+ for (let i = 0; i < rows.length; i++) {
cache_delete("article:" + rows[i]);
}
- new Ajax.Request("backend.php", {
- parameters: query,
- onComplete: function(transport) {
- handle_rpc_json(transport);
- viewCurrentFeed();
- } });
+ const query = {op: "rpc", method: op, ids: rows.toString()};
+ xhrPost("backend.php", query, (transport) => {
+ handle_rpc_json(transport);
+ viewCurrentFeed();
+ });
}
function catchupSelection() {
- var rows = getSelectedArticleIds2();
+ const rows = getSelectedArticleIds2();
if (rows.length == 0) {
alert(__("No articles are selected."));
return;
}
- var fn = getFeedName(getActiveFeedId(), activeFeedIsCat());
+ const fn = getFeedName(getActiveFeedId(), activeFeedIsCat());
- var str = ngettext("Mark %d selected article in %s as read?", "Mark %d selected articles in %s as read?", rows.length);
+ let str = ngettext("Mark %d selected article in %s as read?", "Mark %d selected articles in %s as read?", rows.length);
str = str.replace("%d", rows.length);
str = str.replace("%s", fn);
@@ -1023,37 +1024,33 @@ function catchupSelection() {
}
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();
- dialog = new dijit.Dialog({
+ const 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 query = dojo.objectToQuery(this.attr('value'));
notify_progress("Saving article tags...", true);
- new Ajax.Request("backend.php", {
- parameters: query,
- onComplete: function(transport) {
+ xhrPost("backend.php", this.attr('value'), (transport) => {
try {
notify('');
dialog.hide();
- var data = JSON.parse(transport.responseText);
+ const data = JSON.parse(transport.responseText);
if (data) {
- var id = data.id;
-
- console.log(id);
+ 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);
@@ -1061,8 +1058,7 @@ function editArticleTags(id) {
} catch (e) {
exception_error(e);
}
-
- }});
+ });
}
},
href: query
@@ -1081,8 +1077,8 @@ function editArticleTags(id) {
}
function cdmScrollToArticleId(id, force) {
- var ctr = $("headlines-frame");
- var e = $("RROW-" + id);
+ const ctr = $("headlines-frame");
+ const e = $("RROW-" + id);
if (!e || !ctr) return;
@@ -1091,14 +1087,49 @@ function cdmScrollToArticleId(id, force) {
// expanded cdm has a 4px margin now
ctr.scrollTop = parseInt(e.offsetTop) - 4;
+
+ /*setActiveArticleId(id);
+
+ // article is selected manually, set it read
+ toggleUnread(id, 0); */
}
}
+// for the time being active article does not affect buffer selection (we still re/set the checkbox
+// because of getSelectedArticleIds2() hack
function setActiveArticleId(id) {
- console.log("setActiveArticleId:" + id);
+ console.log("setActiveArticleId", id);
+
+ $$("div[id*=RROW][class*=active]").each((e) => {
+ e.removeClassName("active");
+
+ if (!e.hasClassName("Selected")) {
+ const cb = dijit.getEnclosingWidget(e.select(".rchk")[0]);
+ if (cb) cb.attr("checked", false);
+ }
+ })
_active_article_id = id;
- PluginHost.run(PluginHost.HOOK_ARTICLE_SET_ACTIVE, _active_article_id);
+
+ const row = $("RROW-" + id);
+
+ if (row) {
+ if (row.hasClassName("Unread")) {
+ toggleUnread(id, 0);
+
+ decrementFeedCounter(getActiveFeedId(), activeFeedIsCat());
+ updateFloatingTitle(true);
+ }
+
+ row.addClassName("active");
+
+ if (!row.hasClassName("Selected")) {
+ const cb = dijit.getEnclosingWidget(row.select(".rchk")[0]);
+ if (cb) cb.attr("checked", true);
+ }
+
+ PluginHost.run(PluginHost.HOOK_ARTICLE_SET_ACTIVE, _active_article_id);
+ }
}
function getActiveArticleId() {
@@ -1114,26 +1145,30 @@ function postMouseOut(id) {
}
function unpackVisibleHeadlines() {
- if (!isCdmMode() || !getInitParam("cdm_expanded")) return;
+ if (!isCdmMode()) return;
- $$("#headlines-frame span.cencw[id]").each(
- function (child) {
- var row = $("RROW-" + child.id.replace("CENCW-", ""));
+ const rows = $$("#headlines-frame div[id*=RROW][data-content]");
+ const threshold = $("headlines-frame").scrollTop + $("headlines-frame").offsetHeight + 300;
- if (row && row.offsetTop <= $("headlines-frame").scrollTop +
- $("headlines-frame").offsetHeight) {
+ for (let i = 0; i < rows.length; i++) {
+ const row = rows[i];
- //console.log("unpacking: " + child.id);
+ if (row.offsetTop <= threshold) {
+ console.log("unpacking: " + row.id);
- child.innerHTML = htmlspecialchars_decode(child.innerHTML);
- child.removeAttribute('id');
+ row.select(".content-inner")[0].innerHTML = row.getAttribute("data-content");
+ row.removeAttribute("data-content");
- PluginHost.run(PluginHost.HOOK_ARTICLE_RENDERED_CDM, row);
+ PluginHost.run(PluginHost.HOOK_ARTICLE_RENDERED_CDM, row);
- Element.show(child);
- }
+ // i wonder if this is a good idea?
+ if (!getActiveArticleId() && !row.hasClassName("Unread"))
+ setActiveArticleId(row.getAttribute("data-article-id"));
+
+ } else {
+ break;
}
- );
+ }
}
function headlines_scroll_handler(e) {
@@ -1146,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 = " " +
@@ -1193,34 +1229,31 @@ function headlines_scroll_handler(e) {
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;
+ let rows = $$("#headlines-frame > div[id*=RROW][class*=Unread]");
- $$("#headlines-frame > div[id*=RROW][class*=Unread]").each(
- function(child) {
- if (child.hasClassName("Unread") && $("headlines-frame").scrollTop >
- (child.offsetTop + child.offsetHeight/2)) {
+ for (let i = 0; i < rows.length; i++) {
+ const row = rows[i];
+
+ if ($("headlines-frame").scrollTop > (row.offsetTop + row.offsetHeight/2)) {
- var id = child.getAttribute("data-article-id")
+ const id = row.getAttribute("data-article-id")
- if (catchup_id_batch.indexOf(id) == -1)
- catchup_id_batch.push(id);
+ if (catchup_id_batch.indexOf(id) == -1)
+ catchup_id_batch.push(id);
- //console.log("auto_catchup_batch: " + catchup_id_batch.toString());
- }
-
- });
+ //console.log("auto_catchup_batch: " + catchup_id_batch.toString());
+ } else {
+ break;
+ }
+ }
if (_infscroll_disable) {
- var child = $$("#headlines-frame div[id*=RROW]").last();
+ const row = $$("#headlines-frame div[id*=RROW]").last();
- if (child && $("headlines-frame").scrollTop >
- (child.offsetTop + child.offsetHeight - 50)) {
+ if (row && $("headlines-frame").scrollTop >
+ (row.offsetTop + row.offsetHeight - 50)) {
console.log("we seem to be at an end");
@@ -1237,45 +1270,39 @@ function headlines_scroll_handler(e) {
}
function openNextUnreadFeed() {
- var is_cat = activeFeedIsCat();
- var nuf = getNextUnreadFeed(getActiveFeedId(), is_cat);
+ const is_cat = activeFeedIsCat();
+ const nuf = getNextUnreadFeed(getActiveFeedId(), is_cat);
if (nuf) viewfeed({feed: nuf, is_cat: is_cat});
}
function catchupBatchedArticles() {
if (catchup_id_batch.length > 0 && !_infscroll_request_sent && !_catchup_request_sent) {
- console.log("catchupBatchedArticles: working");
+ console.log("catchupBatchedArticles, size=", catchup_id_batch.length);
// make a copy of the array
- var batch = catchup_id_batch.slice();
- var query = "?op=rpc&method=catchupSelected" +
- "&cmode=0&ids=" + param_escape(batch.toString());
-
- console.log(query);
+ const batch = catchup_id_batch.slice();
+ const query = { op: "rpc", method: "catchupSelected",
+ cmode: 0, ids: batch.toString() };
_catchup_request_sent = true;
- new Ajax.Request("backend.php", {
- parameters: query,
- onComplete: function (transport) {
- handle_rpc_json(transport);
+ xhrPost("backend.php", query, (transport) => {
+ const reply = handle_rpc_json(transport);
- _catchup_request_sent = false;
+ _catchup_request_sent = false;
- reply = JSON.parse(transport.responseText);
- var batch = reply.ids;
+ if (reply) {
+ const batch = reply.ids;
batch.each(function (id) {
- console.log(id);
- var elem = $("RROW-" + id);
+ const elem = $("RROW-" + id);
if (elem) elem.removeClassName("Unread");
catchup_id_batch.remove(id);
});
-
- updateFloatingTitle(true);
-
}
+
+ updateFloatingTitle(true);
});
}
}
@@ -1289,14 +1316,14 @@ function catchupRelativeToArticle(below, id) {
return;
}
- var visible_ids = getLoadedArticleIds();
+ const visible_ids = getLoadedArticleIds();
- var ids_to_mark = new Array();
+ const ids_to_mark = [];
if (!below) {
- for (var i = 0; i < visible_ids.length; i++) {
+ for (let i = 0; i < visible_ids.length; i++) {
if (visible_ids[i] != id) {
- var e = $("RROW-" + visible_ids[i]);
+ const e = $("RROW-" + visible_ids[i]);
if (e && e.hasClassName("Unread")) {
ids_to_mark.push(visible_ids[i]);
@@ -1306,9 +1333,9 @@ function catchupRelativeToArticle(below, id) {
}
}
} else {
- for (var i = visible_ids.length - 1; i >= 0; i--) {
+ for (let i = visible_ids.length - 1; i >= 0; i--) {
if (visible_ids[i] != id) {
- var e = $("RROW-" + visible_ids[i]);
+ const e = $("RROW-" + visible_ids[i]);
if (e && e.hasClassName("Unread")) {
ids_to_mark.push(visible_ids[i]);
@@ -1322,7 +1349,7 @@ function catchupRelativeToArticle(below, id) {
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);
+ const 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)) {
@@ -1331,137 +1358,28 @@ function catchupRelativeToArticle(below, id) {
e.removeClassName("Unread");
}
- var query = "?op=rpc&method=catchupSelected" +
- "&cmode=0" + "&ids=" + param_escape(ids_to_mark.toString());
+ const query = { op: "rpc", method: "catchupSelected",
+ cmode: 0, ids: ids_to_mark.toString() };
- new Ajax.Request("backend.php", {
- parameters: query,
- onComplete: function (transport) {
- handle_rpc_json(transport);
- }
+ xhrPost("backend.php", query, (transport) => {
+ handle_rpc_json(transport);
});
-
}
}
}
-function cdmCollapseArticle(event, id, unmark) {
- if (unmark == undefined) unmark = true;
-
- var row = $("RROW-" + id);
- var elem = $("CICD-" + id);
-
- if (elem && row) {
- var collapse = row.select("span[class='collapseBtn']")[0];
-
- Element.hide(elem);
- Element.show("CEXC-" + id);
- Element.hide(collapse);
-
- if (unmark) {
- row.removeClassName("active");
-
- markHeadline(id, false);
-
- if (id == getActiveArticleId()) {
- setActiveArticleId(0);
- }
-
- updateSelectedPrompt();
- }
-
- if (event) Event.stop(event);
-
- PluginHost.run(PluginHost.HOOK_ARTICLE_COLLAPSED, id);
-
- if (row.offsetTop < $("headlines-frame").scrollTop)
- scrollToRowId(row.id);
-
- $("floatingTitle").style.visibility = "hidden";
- $("floatingTitle").setAttribute("data-article-id", 0);
- }
-}
-
-function cdmExpandArticle(id, noexpand) {
- console.log("cdmExpandArticle " + id);
-
- var row = $("RROW-" + id);
-
- if (!row) return false;
-
- var oldrow = $("RROW-" + getActiveArticleId());
-
- var elem = $("CICD-" + getActiveArticleId());
-
- if (id == getActiveArticleId() && Element.visible(elem))
- return true;
-
- selectArticles("none");
-
- var old_offset = row.offsetTop;
-
- if (getActiveArticleId() && elem && !getInitParam("cdm_expanded")) {
- var collapse = oldrow.select("span[class='collapseBtn']")[0];
-
- Element.hide(elem);
- Element.show("CEXC-" + getActiveArticleId());
- Element.hide(collapse);
- }
-
- if (oldrow) oldrow.removeClassName("active");
-
- setActiveArticleId(id);
-
- elem = $("CICD-" + id);
-
- var collapse = row.select("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);
- }
-
- var new_offset = row.offsetTop;
-
- if (old_offset > new_offset)
- $("headlines-frame").scrollTop -= (old_offset - new_offset);
-
- if (!noexpand) {
- if (catchup_id_batch.indexOf(id) == -1)
- catchup_id_batch.push(id);
-
- catchupCurrentBatchIfNeeded();
- }
-
- toggleSelected(id);
- row.addClassName("active");
-
- PluginHost.run(PluginHost.HOOK_ARTICLE_EXPANDED, id);
-
- return false;
-}
-
function getArticleUnderPointer() {
return post_under_pointer;
}
function scrollArticle(offset) {
if (!isCdmMode()) {
- var ci = $("content-insert");
+ const ci = $("content-insert");
if (ci) {
ci.scrollTop += offset;
}
} else {
- var hi = $("headlines-frame");
+ const hi = $("headlines-frame");
if (hi) {
hi.scrollTop += offset;
}
@@ -1470,7 +1388,7 @@ function scrollArticle(offset) {
}
function show_labels_in_headlines(transport) {
- var data = JSON.parse(transport.responseText);
+ const data = JSON.parse(transport.responseText);
if (data) {
data['info-for-headlines'].each(function (elem) {
@@ -1482,53 +1400,53 @@ function show_labels_in_headlines(transport) {
}
function cdmClicked(event, id, in_body) {
- //var shift_key = event.shiftKey;
+ if (event.ctrlKey && !in_body) {
+ openArticleInNewWindow(id);
+ }
- if (!event.ctrlKey && !event.metaKey) {
+ setActiveArticleId(id);
- if (!getInitParam("cdm_expanded")) {
- return cdmExpandArticle(id);
- } else {
+ //var shift_key = event.shiftKey;
- var elem = $("RROW-" + getActiveArticleId());
+ /* if (!event.ctrlKey && !event.metaKey) {
- if (elem) elem.removeClassName("active");
+ let elem = $("RROW-" + getActiveArticleId());
- selectArticles("none");
- toggleSelected(id);
+ if (elem) elem.removeClassName("active");
- var elem = $("RROW-" + id);
- var article_is_unread = elem.hasClassName("Unread");
+ selectArticles("none");
+ toggleSelected(id);
- elem.removeClassName("Unread");
- elem.addClassName("active");
+ elem = $("RROW-" + id);
+ const article_is_unread = elem.hasClassName("Unread");
- setActiveArticleId(id);
+ elem.removeClassName("Unread");
+ elem.addClassName("active");
- if (article_is_unread) {
- decrementFeedCounter(getActiveFeedId(), activeFeedIsCat());
- updateFloatingTitle(true);
- }
+ setActiveArticleId(id);
- var query = "?op=rpc&method=catchupSelected" +
- "&cmode=0&ids=" + param_escape(id);
+ if (article_is_unread) {
+ decrementFeedCounter(getActiveFeedId(), activeFeedIsCat());
+ updateFloatingTitle(true);
- new Ajax.Request("backend.php", {
- parameters: query,
- onComplete: function (transport) {
- handle_rpc_json(transport);
- }
- });
+ const query = {
+ op: "rpc", method: "catchupSelected",
+ cmode: 0, ids: id
+ };
- return !event.shiftKey;
+ xhrPost("backend.php", query, (transport) => {
+ handle_rpc_json(transport);
+ });
}
+ return !event.shiftKey;
+
} else if (!in_body) {
toggleSelected(id, true);
- var elem = $("RROW-" + id);
- var article_is_unread = elem.hasClassName("Unread");
+ let elem = $("RROW-" + id);
+ const article_is_unread = elem.hasClassName("Unread");
if (article_is_unread) {
decrementFeedCounter(getActiveFeedId(), activeFeedIsCat());
@@ -1541,31 +1459,36 @@ function cdmClicked(event, id, in_body) {
return true;
}
- var unread_in_buffer = $$("#headlines-frame > div[id*=RROW][class*=Unread]").length
- request_counters(unread_in_buffer == 0);
+ const unread_in_buffer = $$("#headlines-frame > div[id*=RROW][class*=Unread]").length
+ request_counters(unread_in_buffer == 0); */
return false;
}
function hlClicked(event, id) {
- if (event.which == 2) {
+ if (event.ctrlKey) {
+ openArticleInNewWindow(id);
+ setActiveArticleId(id);
+ } else {
+ view(id);
+ }
+
+ return false;
+
+ /* if (event.which == 2) {
view(id);
return true;
} else if (event.ctrlKey || event.metaKey) {
- toggleSelected(id, true);
- toggleUnread(id, 0, false);
openArticleInNewWindow(id);
return false;
} else {
view(id);
return false;
- }
+ } */
}
function openArticleInNewWindow(id) {
- toggleUnread(id, 0, false);
-
- var w = window.open("");
+ const w = window.open("");
w.opener = null;
w.location = "backend.php?op=article&method=redirect&id=" + id;
}
@@ -1574,12 +1497,12 @@ 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) {
@@ -1591,19 +1514,19 @@ function markHeadline(id, marked) {
else
row.removeClassName("Selected");
}
-}
+} */
function getRelativePostIds(id, limit) {
- var tmp = [];
+ const tmp = [];
if (!limit) limit = 6; //3
- var ids = getLoadedArticleIds();
+ const ids = getLoadedArticleIds();
- for (var i = 0; i < ids.length; i++) {
+ for (let i = 0; i < ids.length; i++) {
if (ids[i] == id) {
- for (var k = 1; k <= limit; k++) {
+ 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]);
}
@@ -1615,16 +1538,15 @@ function getRelativePostIds(id, limit) {
}
function correctHeadlinesOffset(id) {
-
- var container = $("headlines-frame");
- var row = $("RROW-" + id);
+ const container = $("headlines-frame");
+ const row = $("RROW-" + id);
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);
@@ -1632,10 +1554,6 @@ function correctHeadlinesOffset(id) {
if (rel_offset_top <= 0 || rel_offset_top > viewport) {
container.scrollTop = row.offsetTop;
} else if (rel_offset_bottom > viewport) {
-
- /* doesn't properly work with Opera in some cases because
- Opera fucks up element scrolling */
-
container.scrollTop = row.offsetTop + row.offsetHeight - viewport;
}
}
@@ -1646,7 +1564,6 @@ function headlineActionsChange(elem) {
}
function closeArticlePanel() {
-
if (dijit.byId("content-insert"))
dijit.byId("headlines-wrap-inner").removeChild(
dijit.byId("content-insert"));
@@ -1655,7 +1572,7 @@ function closeArticlePanel() {
function initFloatingMenu() {
if (!dijit.byId("floatingMenu")) {
- var menu = new dijit.Menu({
+ const menu = new dijit.Menu({
id: "floatingMenu",
targetNodeIds: ["floatingTitle"]
});
@@ -1686,12 +1603,12 @@ function headlinesMenuCommon(menu) {
menu.addChild(new dijit.MenuItem({
label: __("Toggle unread"),
- onClick: function (event) {
+ onClick: function () {
- var ids = getSelectedArticleIds2();
+ let ids = getSelectedArticleIds2();
// cast to string
- var id = (this.getParent().currentTarget.getAttribute("data-article-id")) + "";
- ids = ids.size() != 0 && ids.indexOf(id) != -1 ? ids : [id];
+ const id = (this.getParent().currentTarget.getAttribute("data-article-id")) + "";
+ ids = ids.length != 0 && ids.indexOf(id) != -1 ? ids : [id];
selectionToggleUnread(undefined, false, true, ids);
}
@@ -1699,11 +1616,11 @@ function headlinesMenuCommon(menu) {
menu.addChild(new dijit.MenuItem({
label: __("Toggle starred"),
- onClick: function (event) {
- var ids = getSelectedArticleIds2();
+ onClick: function () {
+ let ids = getSelectedArticleIds2();
// cast to string
- var id = (this.getParent().currentTarget.getAttribute("data-article-id")) + "";
- ids = ids.size() != 0 && ids.indexOf(id) != -1 ? ids : [id];
+ const id = (this.getParent().currentTarget.getAttribute("data-article-id")) + "";
+ ids = ids.length != 0 && ids.indexOf(id) != -1 ? ids : [id];
selectionToggleMarked(undefined, false, true, ids);
}
@@ -1711,11 +1628,11 @@ function headlinesMenuCommon(menu) {
menu.addChild(new dijit.MenuItem({
label: __("Toggle published"),
- onClick: function (event) {
- var ids = getSelectedArticleIds2();
+ onClick: function () {
+ let ids = getSelectedArticleIds2();
// cast to string
- var id = (this.getParent().currentTarget.getAttribute("data-article-id")) + "";
- ids = ids.size() != 0 && ids.indexOf(id) != -1 ? ids : [id];
+ const id = (this.getParent().currentTarget.getAttribute("data-article-id")) + "";
+ ids = ids.length != 0 && ids.indexOf(id) != -1 ? ids : [id];
selectionTogglePublished(undefined, false, true, ids);
}
@@ -1725,42 +1642,42 @@ function headlinesMenuCommon(menu) {
menu.addChild(new dijit.MenuItem({
label: __("Mark above as read"),
- onClick: function (event) {
+ onClick: function () {
catchupRelativeToArticle(0, this.getParent().currentTarget.getAttribute("data-article-id"));
}
}));
menu.addChild(new dijit.MenuItem({
label: __("Mark below as read"),
- onClick: function (event) {
+ onClick: function () {
catchupRelativeToArticle(1, this.getParent().currentTarget.getAttribute("data-article-id"));
}
}));
- var labels = getInitParam("labels");
+ const labels = getInitParam("labels");
- if (labels) {
+ if (labels && labels.length) {
menu.addChild(new dijit.MenuSeparator());
- var labelAddMenu = new dijit.Menu({ownerMenu: menu});
- var labelDelMenu = new dijit.Menu({ownerMenu: menu});
+ const labelAddMenu = new dijit.Menu({ownerMenu: menu});
+ const labelDelMenu = new dijit.Menu({ownerMenu: menu});
labels.each(function (label) {
- var bare_id = label.id;
- var name = label.caption;
+ const bare_id = label.id;
+ const name = label.caption;
labelAddMenu.addChild(new dijit.MenuItem({
label: name,
labelId: bare_id,
- onClick: function (event) {
+ onClick: function () {
- var ids = getSelectedArticleIds2();
+ let ids = getSelectedArticleIds2();
// cast to string
- var id = (this.getParent().ownerMenu.currentTarget.getAttribute("data-article-id")) + "";
+ const id = (this.getParent().ownerMenu.currentTarget.getAttribute("data-article-id")) + "";
- ids = ids.size() != 0 && ids.indexOf(id) != -1 ? ids : [id];
+ ids = ids.length != 0 && ids.indexOf(id) != -1 ? ids : [id];
selectionAssignLabel(this.labelId, ids);
}
@@ -1769,12 +1686,12 @@ function headlinesMenuCommon(menu) {
labelDelMenu.addChild(new dijit.MenuItem({
label: name,
labelId: bare_id,
- onClick: function (event) {
- var ids = getSelectedArticleIds2();
+ onClick: function () {
+ let ids = getSelectedArticleIds2();
// cast to string
- var id = (this.getParent().ownerMenu.currentTarget.getAttribute("data-article-id")) + "";
+ const id = (this.getParent().ownerMenu.currentTarget.getAttribute("data-article-id")) + "";
- ids = ids.size() != 0 && ids.indexOf(id) != -1 ? ids : [id];
+ ids = ids.length != 0 && ids.indexOf(id) != -1 ? ids : [id];
selectionRemoveLabel(this.labelId, ids);
}
@@ -1798,7 +1715,7 @@ function headlinesMenuCommon(menu) {
function initHeadlinesMenu() {
if (!dijit.byId("headlinesMenu")) {
- var menu = new dijit.Menu({
+ const menu = new dijit.Menu({
id: "headlinesMenu",
targetNodeIds: ["headlines-frame"],
selector: ".hlMenuAttach"
@@ -1813,7 +1730,7 @@ function initHeadlinesMenu() {
if (!dijit.byId("headlinesFeedTitleMenu")) {
- var menu = new dijit.Menu({
+ const menu = new dijit.Menu({
id: "headlinesFeedTitleMenu",
targetNodeIds: ["headlines-frame"],
selector: "div.cdmFeedTitle"
@@ -1831,7 +1748,7 @@ function initHeadlinesMenu() {
menu.addChild(new dijit.MenuItem({
label: __("Mark group as read"),
- onClick: function (event) {
+ onClick: function () {
selectArticles("none");
selectArticles("all",
"#headlines-frame > div[id*=RROW]" +
@@ -1843,14 +1760,14 @@ function initHeadlinesMenu() {
menu.addChild(new dijit.MenuItem({
label: __("Mark feed as read"),
- onClick: function (event) {
+ onClick: function () {
catchupFeedInGroup(this.getParent().currentTarget.getAttribute("data-feed-id"));
}
}));
menu.addChild(new dijit.MenuItem({
label: __("Edit feed"),
- onClick: function (event) {
+ onClick: function () {
editFeed(this.getParent().currentTarget.getAttribute("data-feed-id"));
}
}));
@@ -1890,38 +1807,32 @@ function cancelSearch() {
}
function setSelectionScore() {
- var ids = getSelectedArticleIds2();
+ const ids = getSelectedArticleIds2();
if (ids.length > 0) {
console.log(ids);
- var score = prompt(__("Please enter new score for selected articles:"), score);
+ const score = prompt(__("Please enter new score for selected articles:"));
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 query = { op: "article", method: "setScore", id: ids.toString(),
+ score: score };
+
+ xhrJson("backend.php", query, (reply) => {
+ if (reply) {
+ reply.id.each((id) => {
+ const row = $("RROW-" + id);
+
+ if (row) {
+ const pic = row.getElementsByClassName("score-pic")[0];
+
+ if (pic) {
+ pic.src = pic.src.replace(/score_.*?\.png/,
+ reply["score_pic"]);
+ pic.setAttribute("score", reply["score"]);
}
- });
- }
+ }
+ });
}
});
}
@@ -1931,72 +1842,38 @@ function setSelectionScore() {
}
}
-function updateScore(id) {
- 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"]);
- }
- }
- });
- }
-}
-
function changeScore(id, pic) {
- var score = pic.getAttribute("score");
+ const score = pic.getAttribute("score");
- var new_score = prompt(__("Please enter new score for this article:"), score);
+ const new_score = prompt(__("Please enter new score for this article:"), score);
if (new_score != undefined) {
+ const query = { op: "article", method: "setScore", id: id, score: new_score };
- 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) {
- 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);
- }
+ 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) {
- var query = "op=rpc&method=getlinktitlebyid&id=" + param_escape(id);
-
- new Ajax.Request("backend.php", {
- parameters: query,
- onComplete: function (transport) {
- var reply = JSON.parse(transport.responseText);
+ const query = { op: "rpc", method: "getlinktitlebyid", id: id };
- if (reply && reply.link) {
- prompt(__("Article URL:"), reply.link);
- }
+ xhrJson("backend.php", query, (reply) => {
+ if (reply && reply.link) {
+ prompt(__("Article URL:"), reply.link);
}
});
+
}
+// floatingTitle goto button uses this
function scrollToRowId(id) {
- var row = $(id);
+ const row = $(id);
if (row)
$("headlines-frame").scrollTop = row.offsetTop - 4;
@@ -2005,17 +1882,16 @@ function scrollToRowId(id) {
function updateFloatingTitle(unread_only) {
if (!isCdmMode()) return;
- var hf = $("headlines-frame");
-
- 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) {
- 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")) {
@@ -2026,7 +1902,7 @@ function updateFloatingTitle(unread_only) {
initFloatingMenu();
- var cb = $$("#floatingTitle .dijitCheckBox")[0];
+ const cb = $$("#floatingTitle .dijitCheckBox")[0];
if (cb)
cb.parentNode.removeChild(cb);
@@ -2052,18 +1928,3 @@ function updateFloatingTitle(unread_only) {
}
}
}
-
-function catchupCurrentBatchIfNeeded() {
- if (catchup_id_batch.length > 0) {
- window.clearTimeout(catchup_timeout_id);
- catchup_timeout_id = window.setTimeout(catchupBatchedArticles, 1000);
-
- if (catchup_id_batch.length >= 10) {
- catchupBatchedArticles();
- }
- }
-}
-
-function cdmFooterClick(event) {
- event.stopPropagation();
-}