" +
__('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;
@@ -314,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
@@ -835,6 +838,8 @@ function selectionToggleUnread(set_state, callback, no_error, ids) {
}
}
+ updateFloatingTitle(true);
+
if (rows.length > 0) {
var cmode = "";
@@ -959,10 +964,12 @@ 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-", "");
@@ -1241,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) {
@@ -1273,15 +1280,15 @@ function headlines_scroll_handler(e) {
unpackVisibleHeadlines();
// set topmost child in the buffer as active
- if (getInitParam("cdm_auto_catchup") == 1 &&
+ if (isCdmMode() && getInitParam("cdm_auto_catchup") == 1 &&
getSelectedArticleIds2().length <= 1 &&
- (!isCdmMode() || getInitParam("cdm_expanded"))) {
+ 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 &&
+ if ($("headlines-frame").scrollTop <= child.offsetTop &&
child.offsetTop - $("headlines-frame").scrollTop < 100 &&
child.id.replace("RROW-", "") != _active_article_id) {
@@ -1312,10 +1319,15 @@ 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 (getInitParam("cdm_expanded") && isCdmMode()) {
+ if (isCdmMode()) {
updateFloatingTitle();
}
@@ -1348,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) {
@@ -1355,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) {
@@ -1381,6 +1417,8 @@ function catchupBatchedArticles() {
catchup_id_batch.remove(id);
});
+ updateFloatingTitle(true);
+
} });
}
@@ -1489,6 +1527,12 @@ function cdmCollapseArticle(event, id, unmark) {
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) {
@@ -1593,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) {
@@ -1736,6 +1780,7 @@ function cdmClicked(event, id) {
if (article_is_unread) {
decrementFeedCounter(getActiveFeedId(), activeFeedIsCat());
+ updateFloatingTitle(true);
}
var query = "?op=rpc&method=catchupSelected" +
@@ -1750,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);
@@ -1910,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 (dijit.byId("floatingMenu"))
+ dijit.byId("floatingMenu").destroyRecursive();
- if (!isCdmMode()) {
- nodes = $$("#headlines-frame > div[id*=RROW]");
- } else {
- nodes = $$("#headlines-frame span[id*=RTITLE]");
- }
-
- nodes.each(function(node) {
- ids.push(node.id);
- });
-
- var menu = new dijit.Menu({
- id: "headlinesMenu",
- targetNodeIds: ids,
- });
+ var menu = new dijit.Menu({
+ id: "floatingMenu",
+ targetNodeIds: ["floatingTitle"]
+ });
- var tmph = dojo.connect(menu, '_openMyself', function (event) {
- var callerNode = event.target, match = null, tries = 0;
+ var id = $("floatingTitle").getAttribute("rowid").replace("RROW-", "");
- while (match == null && callerNode && tries <= 3) {
- match = callerNode.id.match("^[A-Z]+[-]([0-9]+)$");
- callerNode = callerNode.parentNode;
- ++tries;
- }
+ headlinesMenuCommon(menu, id);
- 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());
@@ -1971,7 +1998,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];
selectionToggleUnread(undefined, false, true, ids);
@@ -1982,7 +2009,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];
selectionToggleMarked(undefined, false, true, ids);
@@ -1993,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);
@@ -2004,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);
}}));
@@ -2036,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];
@@ -2049,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];
@@ -2070,8 +2097,117 @@ function initHeadlinesMenu() {
}
+
+ } 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);
+ });
+
+ 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();
+
+ }
+
} catch (e) {
exception_error("initHeadlinesMenu", e);
}
@@ -2227,8 +2363,10 @@ function scrollToRowId(id) {
}
}
-function updateFloatingTitle() {
+function updateFloatingTitle(unread_only) {
try {
+ if (!isCdmMode()) return;
+
var hf = $("headlines-frame");
var elems = $$("#headlines-frame > div[id*=RROW]");
@@ -2241,10 +2379,24 @@ function updateFloatingTitle() {
var header = child.getElementsByClassName("cdmHeader")[0];
- if (child.id != $("floatingTitle").getAttribute("rowid")) {
- $("floatingTitle").setAttribute("rowid", child.id);
- $("floatingTitle").innerHTML = header.innerHTML;
- $("floatingTitle").firstChild.innerHTML = "
" + $("floatingTitle").firstChild.innerHTML;
+ 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);
}