X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=js%2Fviewfeed.js;h=14c9217c12f3d9431f68f39063b62a028c327e18;hb=1d6191ee0a115a7029bfe4983f6ecb04c6f5dd6c;hp=7813ab7ef7f3c3f90e37b61198f235538fab5891;hpb=ae31704bb3dfc55b960f58551fdf7367959a3f54;p=tt-rss.git
diff --git a/js/viewfeed.js b/js/viewfeed.js
index 7813ab7e..14c9217c 100644
--- a/js/viewfeed.js
+++ b/js/viewfeed.js
@@ -20,8 +20,6 @@ function headlines_callback2(transport, offset, background, infscroll_req) {
try {
handle_rpc_json(transport);
- loading_set_progress(25);
-
console.log("headlines_callback2 [offset=" + offset + "] B:" + background + " I:" + infscroll_req);
var is_cat = false;
@@ -43,13 +41,12 @@ function headlines_callback2(transport, offset, background, infscroll_req) {
if (background) {
var content = reply['headlines']['content'];
- if (getInitParam("cdm_auto_catchup") == 1) {
- content = content + "
";
- }
+ content = content + "";
return;
}
- setActiveFeedId(feed_id, is_cat);
+ if (feed_id != getActiveFeedId() || is_cat != activeFeedIsCat())
+ return;
/* dijit.getEnclosingWidget(
document.forms["main_toolbar_form"].update).attr('disabled',
@@ -58,9 +55,18 @@ function headlines_callback2(transport, offset, background, infscroll_req) {
try {
if (infscroll_req == false) {
$("headlines-frame").scrollTop = 0;
+
+ Element.hide("floatingTitle");
+ $("floatingTitle").setAttribute("rowid", 0);
+ $("floatingTitle").innerHTML = "";
}
} catch (e) { };
+ $("headlines-frame").removeClassName("cdm");
+ $("headlines-frame").removeClassName("normal");
+
+ $("headlines-frame").addClassName(isCdmMode() ? "cdm" : "normal");
+
var headlines_count = reply['headlines-info']['count'];
vgroup_last_feed = reply['headlines-info']['vgroup_last_feed'];
@@ -81,8 +87,12 @@ function headlines_callback2(transport, offset, background, infscroll_req) {
dijit.byId("headlines-frame").attr('content',
reply['headlines']['content']);
- dijit.byId("headlines-toolbar").attr('content',
- reply['headlines']['toolbar']);
+ //dijit.byId("headlines-toolbar").attr('content',
+ // reply['headlines']['toolbar']);
+
+ dojo.html.set($("headlines-toolbar"),
+ reply['headlines']['toolbar'],
+ {parseContent: true});
$$("#headlines-frame > div[id*=RROW]").each(function(row) {
if (loaded_article_ids.indexOf(row.id) != -1) {
@@ -92,14 +102,16 @@ function headlines_callback2(transport, offset, background, infscroll_req) {
}
});
- if (getInitParam("cdm_auto_catchup") == 1) {
- var hsp = $("headlines-spacer");
- if (!hsp) hsp = new Element("DIV", {"id": "headlines-spacer"});
- dijit.byId('headlines-frame').domNode.appendChild(hsp);
- }
+ var hsp = $("headlines-spacer");
+ if (!hsp) hsp = new Element("DIV", {"id": "headlines-spacer"});
+ dijit.byId('headlines-frame').domNode.appendChild(hsp);
initHeadlinesMenu();
+ if (_infscroll_disable)
+ hsp.innerHTML = "" +
+ __("Click to open next unread feed.") + "";
+
if (_search_query) {
$("feed_title").innerHTML += "" +
" (" + __("Cancel search") + ")" +
@@ -139,11 +151,9 @@ function headlines_callback2(transport, offset, background, infscroll_req) {
if (!hsp) hsp = new Element("DIV", {"id": "headlines-spacer"});
- fixHeadlinesOrder(getLoadedArticleIds());
-
- if (getInitParam("cdm_auto_catchup") == 1) {
+// if (getInitParam("cdm_auto_catchup") == 1) {
c.domNode.appendChild(hsp);
- }
+// }
console.log("added " + new_elems.size() + " headlines");
@@ -159,16 +169,10 @@ function headlines_callback2(transport, offset, background, infscroll_req) {
initHeadlinesMenu();
new_elems.each(function(child) {
- var cb = dijit.byId(child.id.replace("RROW-", "RCHK-"));
-
- if (!cb) {
- dojo.parser.parse(child);
+ dojo.parser.parse(child);
- if (!Element.visible(child))
- new Effect.Appear(child, { duration : 0.5 });
- } else {
- c.domNode.removeChild(child);
- }
+ if (!Element.visible(child))
+ new Effect.Appear(child, { duration : 0.5 });
});
} else {
@@ -176,7 +180,7 @@ function headlines_callback2(transport, offset, background, infscroll_req) {
var hsp = $("headlines-spacer");
- if (hsp) hsp.innerHTML = "";
+ if (hsp) hsp.innerHTML = "Click to open next unread feed.";
}
}
@@ -194,14 +198,11 @@ function headlines_callback2(transport, offset, background, infscroll_req) {
else
request_counters(true);
- } else if (transport.responseText) {
+ } 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)') +
"
");
- } else {
- //notify_error("Error communicating with server.");
- Element.show(dijit.byId("net-alert").domNode);
}
_infscroll_request_sent = 0;
@@ -209,6 +210,16 @@ function headlines_callback2(transport, offset, background, infscroll_req) {
unpackVisibleHeadlines();
+ // if we have some more space in the buffer, why not try to fill it
+
+ if (!_infscroll_disable && $("headlines-spacer") &&
+ $("headlines-spacer").offsetTop < $("headlines-frame").offsetHeight) {
+
+ window.setTimeout(function() {
+ loadMoreHeadlines();
+ }, 250);
+ }
+
notify("");
} catch (e) {
@@ -227,6 +238,8 @@ function render_article(article) {
c.domNode.scrollTop = 0;
} catch (e) { };
+ PluginHost.run(PluginHost.HOOK_ARTICLE_RENDERED, article);
+
c.attr('content', article);
correctHeadlinesOffset(getActiveArticleId());
@@ -240,7 +253,7 @@ function render_article(article) {
}
}
-function showArticleInHeadlines(id) {
+function showArticleInHeadlines(id, noexpand) {
try {
selectArticles("none");
@@ -251,7 +264,8 @@ function showArticleInHeadlines(id) {
var article_is_unread = crow.hasClassName("Unread");
- crow.removeClassName("Unread");
+ if (!noexpand)
+ crow.removeClassName("Unread");
crow.addClassName("active");
selectArticles('none');
@@ -267,7 +281,7 @@ function showArticleInHeadlines(id) {
markHeadline(id);
- if (article_is_unread)
+ if (article_is_unread && !noexpand)
_force_scheduled_update = true;
} catch (e) {
@@ -305,13 +319,11 @@ function article_callback2(transport, id) {
// return;
// }
- } else if (transport.responseText) {
+ } else {
console.error("Invalid object received: " + transport.responseText);
render_article("" +
__('Could not display article (invalid object received - see error console for details)') + "
");
- } else {
- Element.show(dijit.byId("net-alert").domNode);
}
var unread_in_buffer = $$("#headlines-frame > div[id*=RROW][class*=Unread]").length
@@ -335,7 +347,7 @@ function article_callback2(transport, id) {
}
}
-function view(id) {
+function view(id, activefeed, noexpand) {
try {
var oldrow = $("RROW-" + getActiveArticleId());
if (oldrow) oldrow.removeClassName("active");
@@ -343,6 +355,11 @@ function view(id) {
var crow = $("RROW-" + id);
if (!crow) return;
+ if (noexpand) {
+ setActiveArticleId(id);
+ showArticleInHeadlines(id, noexpand);
+ return;
+ }
console.log("loading article: " + id);
@@ -431,21 +448,41 @@ function toggleMark(id, client_only) {
try {
var query = "?op=rpc&id=" + id + "&method=mark";
- var img = $("FMPIC-" + id);
+ var row = $("RROW-" + id);
+ if (!row) return;
+
+ var imgs = [];
- if (!img) return;
+ var row_imgs = row.getElementsByClassName("markedPic");
- if (img.src.match("mark_unset")) {
- img.src = img.src.replace("mark_unset", "mark_set");
- img.alt = __("Unstar article");
- query = query + "&mark=1";
+ for (var i = 0; i < row_imgs.length; i++)
+ imgs.push(row_imgs[i]);
- } else {
- img.src = img.src.replace("mark_set", "mark_unset");
- img.alt = __("Star article");
- query = query + "&mark=0";
+ var ft = $("floatingTitle");
+
+ if (ft && ft.getAttribute("rowid") == "RROW-" + id) {
+ var 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];
+
+ 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";
+ }
+ }
+
+ row.toggleClassName("marked");
+
if (!client_only) {
new Ajax.Request("backend.php", {
parameters: query,
@@ -469,22 +506,44 @@ function togglePub(id, client_only, no_effects, note) {
query = query + "¬e=undefined";
}
- var img = $("FPPIC-" + id);
+ var row = $("RROW-" + id);
+ if (!row) return;
- if (!img) return;
+ var imgs = [];
- if (img.src.match("pub_unset") || note != undefined) {
- img.src = img.src.replace("pub_unset", "pub_set");
- img.alt = __("Unpublish article");
- query = query + "&pub=1";
+ var row_imgs = row.getElementsByClassName("pubPic");
- } else {
- img.src = img.src.replace("pub_set", "pub_unset");
- img.alt = __("Publish article");
+ for (var i = 0; i < row_imgs.length; i++)
+ imgs.push(row_imgs[i]);
+
+ var ft = $("floatingTitle");
- query = query + "&pub=0";
+ if (ft && ft.getAttribute("rowid") == "RROW-" + id) {
+ var fte = ft.getElementsByClassName("pubPic");
+
+ for (var i = 0; i < fte.length; i++)
+ imgs.push(fte[i]);
}
+ for (i = 0; i < imgs.length; i++) {
+ var 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 (note != undefined)
+ row.addClassName("published");
+ else
+ row.toggleClassName("published");
+
if (!client_only) {
new Ajax.Request("backend.php", {
parameters: query,
@@ -498,7 +557,7 @@ function togglePub(id, client_only, no_effects, note) {
}
}
-function moveToPost(mode, noscroll) {
+function moveToPost(mode, noscroll, noexpand) {
try {
@@ -545,13 +604,13 @@ function moveToPost(mode, noscroll) {
scrollArticle(ctr.offsetHeight/4);
} else if (next_id) {
- cdmExpandArticle(next_id);
+ cdmExpandArticle(next_id, noexpand);
cdmScrollToArticleId(next_id, true);
}
} else if (next_id) {
correctHeadlinesOffset(next_id);
- view(next_id, getActiveFeedId());
+ view(next_id, getActiveFeedId(), noexpand);
}
}
}
@@ -566,10 +625,10 @@ function moveToPost(mode, noscroll) {
if (!getInitParam("cdm_expanded")) {
- if (!noscroll && article.offsetTop < ctr.scrollTop) {
+ if (!noscroll && article && article.offsetTop < ctr.scrollTop) {
scrollArticle(-ctr.offsetHeight/4);
} else {
- cdmExpandArticle(prev_id);
+ cdmExpandArticle(prev_id, noexpand);
cdmScrollToArticleId(prev_id, true);
}
} else {
@@ -578,17 +637,17 @@ function moveToPost(mode, noscroll) {
scrollArticle(-ctr.offsetHeight/3);
} else if (!noscroll && prev_article &&
prev_article.offsetTop < ctr.scrollTop) {
- cdmExpandArticle(prev_id);
+ cdmExpandArticle(prev_id, noexpand);
scrollArticle(-ctr.offsetHeight/4);
} else if (prev_id) {
- cdmExpandArticle(prev_id);
+ cdmExpandArticle(prev_id, noexpand);
cdmScrollToArticleId(prev_id, noscroll);
}
}
} else if (prev_id) {
correctHeadlinesOffset(prev_id);
- view(prev_id, getActiveFeedId());
+ view(prev_id, getActiveFeedId(), noexpand);
}
}
}
@@ -600,11 +659,12 @@ function moveToPost(mode, noscroll) {
function toggleSelected(id, force_on) {
try {
-
- var cb = dijit.byId("RCHK-" + id);
var row = $("RROW-" + id);
if (row) {
+ var cb = dijit.getEnclosingWidget(
+ row.getElementsByClassName("rchk")[0]);
+
if (row.hasClassName('Selected') && !force_on) {
row.removeClassName('Selected');
if (cb) cb.attr("checked", false);
@@ -613,11 +673,33 @@ function toggleSelected(id, force_on) {
if (cb) cb.attr("checked", true);
}
}
+
+ updateSelectedPrompt();
} catch (e) {
exception_error("toggleSelected", e);
}
}
+function updateSelectedPrompt() {
+ try {
+ var count = getSelectedArticleIds2().size();
+ var 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);
+ }
+
+ } catch (e) {
+ exception_error("updateSelectedPrompt", e);
+ }
+}
+
function toggleUnread_afh(effect) {
try {
@@ -756,6 +838,8 @@ function selectionToggleUnread(set_state, callback, no_error, ids) {
}
}
+ updateFloatingTitle(true);
+
if (rows.length > 0) {
var cmode = "";
@@ -880,14 +964,18 @@ function getLoadedArticleIds() {
}
// mode = all,none,unread,invert,marked,published
-function selectArticles(mode) {
+function selectArticles(mode, query) {
try {
- var children = $$("#headlines-frame > div[id*=RROW]");
+ if (!query) query = "#headlines-frame > div[id*=RROW]";
+
+ var children = $$(query);
children.each(function(child) {
var id = child.id.replace("RROW-", "");
- var cb = dijit.byId("RCHK-" + id);
+
+ var cb = dijit.getEnclosingWidget(
+ child.getElementsByClassName("rchk")[0]);
if (mode == "all") {
child.addClassName("Selected");
@@ -901,9 +989,7 @@ function selectArticles(mode) {
if (cb) cb.attr("checked", false);
}
} else if (mode == "marked") {
- var img = $("FMPIC-" + child.id.replace("RROW-", ""));
-
- if (img && img.src.match("mark_set")) {
+ if (child.hasClassName("marked")) {
child.addClassName("Selected");
if (cb) cb.attr("checked", true);
} else {
@@ -911,9 +997,7 @@ function selectArticles(mode) {
if (cb) cb.attr("checked", false);
}
} else if (mode == "published") {
- var img = $("FPPIC-" + child.id.replace("RROW-", ""));
-
- if (img && img.src.match("pub_set")) {
+ if (child.hasClassName("published")) {
child.addClassName("Selected");
if (cb) cb.attr("checked", true);
} else {
@@ -936,6 +1020,8 @@ function selectArticles(mode) {
}
});
+ updateSelectedPrompt();
+
} catch (e) {
exception_error("selectArticles", e);
}
@@ -1145,6 +1231,7 @@ function cdmScrollToArticleId(id, force) {
function setActiveArticleId(id) {
_active_article_id = id;
+ PluginHost.run(PluginHost.HOOK_ARTICLE_SET_ACTIVE, _active_article_id);
}
function getActiveArticleId() {
@@ -1161,7 +1248,7 @@ function postMouseOut(id) {
function unpackVisibleHeadlines() {
try {
- if (!isCdmMode()) return;
+ if (!isCdmMode() || !getInitParam("cdm_expanded")) return;
$$("#headlines-frame > div[id*=RROW]").each(
function(child) {
@@ -1171,6 +1258,8 @@ function unpackVisibleHeadlines() {
var cencw = $("CENCW-" + child.id.replace("RROW-", ""));
if (cencw) {
+ PluginHost.run(PluginHost.HOOK_ARTICLE_RENDERED_CDM, child);
+
cencw.innerHTML = htmlspecialchars_decode(cencw.innerHTML);
cencw.setAttribute('id', '');
Element.show(cencw);
@@ -1190,6 +1279,32 @@ function headlines_scroll_handler(e) {
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]");
+
+ for (var i = 0; i < rows.length; i++) {
+ var child = rows[i];
+
+ if ($("headlines-frame").scrollTop <= child.offsetTop &&
+ child.offsetTop - $("headlines-frame").scrollTop < 100 &&
+ child.id.replace("RROW-", "") != _active_article_id) {
+
+ if (_active_article_id) {
+ var row = $("RROW-" + _active_article_id);
+ if (row) row.removeClassName("active");
+ }
+
+ _active_article_id = child.id.replace("RROW-", "");
+ showArticleInHeadlines(_active_article_id, true);
+ updateSelectedPrompt();
+ break;
+ }
+ }
+ }
+
if (!_infscroll_disable) {
if ((hsp && e.scrollTop + e.offsetHeight >= hsp.offsetTop - hsp.offsetHeight) ||
(e.scrollHeight != 0 &&
@@ -1204,7 +1319,16 @@ function headlines_scroll_handler(e) {
}
} else {
- if (hsp) hsp.innerHTML = "";
+ if (hsp)
+ if (_infscroll_disable)
+ hsp.innerHTML = "" +
+ __("Click to open next unread feed.") + "";
+ else
+ hsp.innerHTML = "";
+ }
+
+ if (isCdmMode()) {
+ updateFloatingTitle();
}
if (getInitParam("cdm_auto_catchup") == 1) {
@@ -1225,6 +1349,7 @@ function headlines_scroll_handler(e) {
//console.log("auto_catchup_batch: " + catchup_id_batch.toString());
}
+
});
if (catchup_id_batch.length > 0) {
@@ -1235,6 +1360,20 @@ function headlines_scroll_handler(e) {
500);
}
}
+
+ if (_infscroll_disable) {
+ var child = $$("#headlines-frame div[id*=RROW]").last();
+
+ if (child && $("headlines-frame").scrollTop >
+ (child.offsetTop + child.offsetHeight - 50)) {
+
+ console.log("we seem to be at an end");
+
+ if (getInitParam("on_catchup_show_next_feed") == "1") {
+ openNextUnreadFeed();
+ }
+ }
+ }
}
} catch (e) {
@@ -1242,6 +1381,16 @@ function headlines_scroll_handler(e) {
}
}
+function openNextUnreadFeed() {
+ try {
+ var is_cat = activeFeedIsCat();
+ var nuf = getNextUnreadFeed(getActiveFeedId(), is_cat);
+ if (nuf) viewfeed(nuf, '', is_cat);
+ } catch (e) {
+ exception_error("openNextUnreadFeed", e);
+ }
+}
+
function catchupBatchedArticles() {
try {
if (catchup_id_batch.length > 0 && !_infscroll_request_sent) {
@@ -1268,6 +1417,8 @@ function catchupBatchedArticles() {
catchup_id_batch.remove(id);
});
+ updateFloatingTitle(true);
+
} });
}
@@ -1346,8 +1497,10 @@ function catchupRelativeToArticle(below, id) {
}
}
-function cdmCollapseArticle(event, id) {
+function cdmCollapseArticle(event, id, unmark) {
try {
+ if (unmark == undefined) unmark = true;
+
var row = $("RROW-" + id);
var elem = $("CICD-" + id);
@@ -1358,15 +1511,28 @@ function cdmCollapseArticle(event, id) {
Element.hide(elem);
Element.show("CEXC-" + id);
Element.hide(collapse);
- row.removeClassName("active");
- markHeadline(id, false);
+ if (unmark) {
+ row.removeClassName("active");
- if (id == getActiveArticleId()) {
- setActiveArticleId(0);
+ 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) {
@@ -1374,7 +1540,7 @@ function cdmCollapseArticle(event, id) {
}
}
-function cdmExpandArticle(id) {
+function cdmExpandArticle(id, noexpand) {
try {
console.log("cdmExpandArticle " + id);
@@ -1411,7 +1577,7 @@ function cdmExpandArticle(id) {
var cencw = $("CENCW-" + id);
- if (!Element.visible(elem)) {
+ if (!Element.visible(elem) && !noexpand) {
if (cencw) {
cencw.innerHTML = htmlspecialchars_decode(cencw.innerHTML);
cencw.setAttribute('id', '');
@@ -1428,10 +1594,13 @@ function cdmExpandArticle(id) {
if (old_offset > new_offset)
$("headlines-frame").scrollTop -= (old_offset-new_offset);
- toggleUnread(id, 0, true);
+ if (!noexpand)
+ toggleUnread(id, 0, true);
toggleSelected(id);
$("RROW-" + id).addClassName("active");
+ PluginHost.run(PluginHost.HOOK_ARTICLE_EXPANDED, id);
+
} catch (e) {
exception_error("cdmExpandArticle", e);
}
@@ -1439,26 +1608,6 @@ function cdmExpandArticle(id) {
return false;
}
-function fixHeadlinesOrder(ids) {
- try {
- for (var i = 0; i < ids.length; i++) {
- var e = $("RROW-" + ids[i]);
-
- if (e) {
- if (i % 2 == 0) {
- e.removeClassName("even");
- e.addClassName("odd");
- } else {
- e.removeClassName("odd");
- e.addClassName("even");
- }
- }
- }
- } catch (e) {
- exception_error("fixHeadlinesOrder", e);
- }
-}
-
function getArticleUnderPointer() {
return post_under_pointer;
}
@@ -1488,9 +1637,9 @@ function show_labels_in_headlines(transport) {
if (data) {
data['info-for-headlines'].each(function(elem) {
- var ctr = $("HLLCTR-" + elem.id);
-
- if (ctr) ctr.innerHTML = elem.labels;
+ $$(".HLLCTR-" + elem.id).each(function(ctr) {
+ ctr.innerHTML = elem.labels;
+ });
});
}
} catch (e) {
@@ -1508,6 +1657,12 @@ function dismissArticle(id) {
new Effect.Fade(elem, {duration : 0.5});
+ // Remove the content, too
+ var elem_content = $("CICD-" + id);
+ if (elem_content) {
+ Element.remove(elem_content);
+ }
+
if (id == getActiveArticleId()) {
setActiveArticleId(0);
}
@@ -1531,6 +1686,12 @@ function dismissSelectedArticles() {
ids[i] != getActiveArticleId()) {
new Effect.Fade(elem, {duration : 0.5});
sel.push(ids[i]);
+
+ // Remove the content, too
+ var elem_content = $("CICD-" + ids[i]);
+ if (elem_content) {
+ Element.remove(elem_content);
+ }
} else {
tmp.push(ids[i]);
}
@@ -1539,7 +1700,6 @@ function dismissSelectedArticles() {
if (sel.length > 0)
selectionToggleUnread(false);
- fixHeadlinesOrder(tmp);
} catch (e) {
exception_error("dismissSelectedArticles", e);
@@ -1559,15 +1719,19 @@ function dismissReadArticles() {
!elem.hasClassName("Selected")) {
new Effect.Fade(elem, {duration : 0.5});
+
+ // Remove the content, too
+ var elem_content = $("CICD-" + ids[i]);
+ if (elem_content) {
+ Element.remove(elem_content);
+ }
} else {
tmp.push(ids[i]);
}
}
- fixHeadlinesOrder(tmp);
-
} catch (e) {
- exception_error("dismissSelectedArticles", e);
+ exception_error("dismissReadArticles", e);
}
}
@@ -1616,6 +1780,7 @@ function cdmClicked(event, id) {
if (article_is_unread) {
decrementFeedCounter(getActiveFeedId(), activeFeedIsCat());
+ updateFloatingTitle(true);
}
var query = "?op=rpc&method=catchupSelected" +
@@ -1630,7 +1795,8 @@ function cdmClicked(event, id) {
return !event.shiftKey;
}
- } else {
+ } else if (event.target.parents(".cdmHeader").length > 0) {
+
toggleSelected(id, true);
var elem = $("RROW-" + id);
@@ -1700,7 +1866,8 @@ function markHeadline(id, marked) {
var row = $("RROW-" + id);
if (row) {
- var check = dijit.byId("RCHK-" + id);
+ var check = dijit.getEnclosingWidget(
+ row.getElementsByClassName("rchk")[0]);
if (check) {
check.attr("checked", marked);
@@ -1789,58 +1956,39 @@ function closeArticlePanel() {
dijit.byId("content-insert"));
}
-function initHeadlinesMenu() {
+function initFloatingMenu() {
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]");
- }
+ if (dijit.byId("floatingMenu"))
+ dijit.byId("floatingMenu").destroyRecursive();
- nodes.each(function(node) {
- ids.push(node.id);
- });
+ var menu = new dijit.Menu({
+ id: "floatingMenu",
+ targetNodeIds: ["floatingTitle"]
+ });
- var menu = new dijit.Menu({
- id: "headlinesMenu",
- targetNodeIds: ids,
- });
+ var id = $("floatingTitle").getAttribute("rowid").replace("RROW-", "");
- var tmph = dojo.connect(menu, '_openMyself', function (event) {
- var callerNode = event.target, match = null, tries = 0;
+ headlinesMenuCommon(menu, id);
- 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]);
-
- });
+ menu.startup();
+ } catch (e) {
+ exception_error("initFloatingMenu", e);
+ }
+}
-/* if (!isCdmMode())
- menu.addChild(new dijit.MenuItem({
- label: __("View article"),
- onClick: function(event) {
- view(this.getParent().callerRowId);
- }})); */
+function headlinesMenuCommon(menu, base_id) {
+ try {
menu.addChild(new dijit.MenuItem({
label: __("Open original article"),
onClick: function(event) {
- openArticleInNewWindow(this.getParent().callerRowId);
+ openArticleInNewWindow(base_id ? base_id : this.getParent().callerRowId);
}}));
menu.addChild(new dijit.MenuItem({
label: __("Display article URL"),
onClick: function(event) {
- displayArticleUrl(this.getParent().callerRowId);
+ displayArticleUrl(base_id ? base_id : this.getParent().callerRowId);
}}));
menu.addChild(new dijit.MenuSeparator());
@@ -1850,18 +1998,18 @@ function initHeadlinesMenu() {
onClick: function(event) {
var ids = getSelectedArticleIds2();
// cast to string
- var id = this.getParent().callerRowId + "";
+ var id = (base_id ? base_id : this.getParent().callerRowId) + "";
ids = ids.size() != 0 && ids.indexOf(id) != -1 ? ids : [id];
selectionToggleUnread(undefined, false, true, ids);
}}));
menu.addChild(new dijit.MenuItem({
- label: __("Toggle marked"),
+ label: __("Toggle starred"),
onClick: function(event) {
var ids = getSelectedArticleIds2();
// cast to string
- var id = this.getParent().callerRowId + "";
+ var id = (base_id ? base_id : this.getParent().callerRowId) + "";
ids = ids.size() != 0 && ids.indexOf(id) != -1 ? ids : [id];
selectionToggleMarked(undefined, false, true, ids);
@@ -1872,7 +2020,7 @@ function initHeadlinesMenu() {
onClick: function(event) {
var ids = getSelectedArticleIds2();
// cast to string
- var id = this.getParent().callerRowId + "";
+ var id = (base_id ? base_id : this.getParent().callerRowId) + "";
ids = ids.size() != 0 && ids.indexOf(id) != -1 ? ids : [id];
selectionTogglePublished(undefined, false, true, ids);
@@ -1883,13 +2031,13 @@ function initHeadlinesMenu() {
menu.addChild(new dijit.MenuItem({
label: __("Mark above as read"),
onClick: function(event) {
- catchupRelativeToArticle(0, this.getParent().callerRowId);
+ catchupRelativeToArticle(0, base_id ? base_id : this.getParent().callerRowId);
}}));
menu.addChild(new dijit.MenuItem({
label: __("Mark below as read"),
onClick: function(event) {
- catchupRelativeToArticle(1, this.getParent().callerRowId);
+ catchupRelativeToArticle(1, base_id ? base_id : this.getParent().callerRowId);
}}));
@@ -1915,7 +2063,7 @@ function initHeadlinesMenu() {
onClick: function(event) {
var ids = getSelectedArticleIds2();
// cast to string
- var id = this.getParent().ownerMenu.callerRowId + "";
+ var id = (base_id ? base_id : this.getParent().ownerMenu.callerRowId) + "";
ids = ids.size() != 0 && ids.indexOf(id) != -1 ? ids : [id];
@@ -1928,7 +2076,7 @@ function initHeadlinesMenu() {
onClick: function(event) {
var ids = getSelectedArticleIds2();
// cast to string
- var id = this.getParent().ownerMenu.callerRowId + "";
+ var id = (base_id ? base_id : this.getParent().ownerMenu.callerRowId) + "";
ids = ids.size() != 0 && ids.indexOf(id) != -1 ? ids : [id];
@@ -1949,38 +2097,119 @@ function initHeadlinesMenu() {
}
- menu.startup();
} catch (e) {
- exception_error("initHeadlinesMenu", e);
+ exception_error("headlinesMenuCommon", e);
}
}
+function initHeadlinesMenu() {
+ try {
+ if (dijit.byId("headlinesMenu"))
+ dijit.byId("headlinesMenu").destroyRecursive();
-function player(elem) {
- var aid = elem.getAttribute("audio-id");
- var status = elem.getAttribute("status");
-
- var audio = $(aid);
+ var ids = [];
- if (audio) {
- if (status == 0) {
- audio.play();
- status = 1;
- elem.innerHTML = __("Playing...");
- elem.title = __("Click to pause");
- elem.addClassName("playing");
+ if (!isCdmMode()) {
+ nodes = $$("#headlines-frame > div[id*=RROW]");
} else {
- audio.pause();
- status = 0;
- elem.innerHTML = __("Play");
- elem.title = __("Click to play");
- elem.removeClassName("playing");
+ nodes = $$("#headlines-frame span[id*=RTITLE]");
+ }
+
+ nodes.each(function(node) {
+ ids.push(node.id);
+ });
+
+ var 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]);
+
+ });
+
+ headlinesMenuCommon(menu, false);
+
+ menu.startup();
+
+ /* vgroup feed title menu */
+
+ var nodes = $$("#headlines-frame > div[class='cdmFeedTitle']");
+ var ids = [];
+
+ nodes.each(function(node) {
+ ids.push(node.id);
+ });
+
+ 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+"']");
+
+ catchupSelection();
+ }}));
+
+
+ menu.addChild(new dijit.MenuItem({
+ label: __("Mark feed as read"),
+ onClick: function(event) {
+ catchupFeedInGroup(menu.callerRowId);
+ }}));
+
+ menu.startup();
+
}
- elem.setAttribute("status", status);
- } else {
- alert("Your browser doesn't seem to support HTML5 audio.");
+ } catch (e) {
+ exception_error("initHeadlinesMenu", e);
}
}
@@ -2121,3 +2350,69 @@ function openSelectedAttachment(elem) {
exception_error("openSelectedAttachment", e);
}
}
+
+function scrollToRowId(id) {
+ try {
+ var row = $(id);
+
+ if (row)
+ $("headlines-frame").scrollTop = row.offsetTop;
+
+ } catch (e) {
+ exception_error("scrollToRowId", e);
+ }
+}
+
+function updateFloatingTitle(unread_only) {
+ try {
+ if (!isCdmMode()) return;
+
+ var hf = $("headlines-frame");
+
+ var elems = $$("#headlines-frame > div[id*=RROW]");
+
+ for (var i = 0; i < elems.length; i++) {
+
+ var child = elems[i];
+
+ if (child && child.offsetTop + child.offsetHeight > hf.scrollTop) {
+
+ var header = child.getElementsByClassName("cdmHeader")[0];
+
+ 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;
+
+ initFloatingMenu();
+
+ var cb = $$("#floatingTitle .dijitCheckBox")[0];
+
+ if (cb)
+ cb.parentNode.removeChild(cb);
+ }
+
+ if (child.hasClassName("Unread"))
+ $("floatingTitle").addClassName("Unread");
+ else
+ $("floatingTitle").removeClassName("Unread");
+
+ PluginHost.run(PluginHost.HOOK_FLOATING_TITLE, child);
+ }
+
+ if (child.offsetTop < hf.scrollTop - header.offsetHeight &&
+ child.offsetTop + child.offsetHeight - hf.scrollTop > header.offsetHeight)
+ Element.show("floatingTitle");
+ else
+ Element.hide("floatingTitle");
+
+ return;
+
+ }
+ }
+
+ } catch (e) {
+ exception_error("updateFloatingTitle", e);
+ }
+}