Merge branch 'master' of github.com:gothfox/Tiny-Tiny-RSS

This commit is contained in:
Andrew Dolgov 2011-12-11 19:35:58 +04:00
commit 63bb227547

View file

@ -1163,12 +1163,13 @@ function catchupBatchedArticles() {
}
}
function catchupRelativeToArticle(below) {
function catchupRelativeToArticle(below, id) {
try {
if (!id) id = getActiveArticleId();
if (!getActiveArticleId()) {
if (!id) {
alert(__("No article is selected."));
return;
}
@ -1179,7 +1180,7 @@ function catchupRelativeToArticle(below) {
if (!below) {
for (var i = 0; i < visible_ids.length; i++) {
if (visible_ids[i] != getActiveArticleId()) {
if (visible_ids[i] != id) {
var e = $("RROW-" + visible_ids[i]);
if (e && e.hasClassName("Unread")) {
@ -1191,7 +1192,7 @@ function catchupRelativeToArticle(below) {
}
} else {
for (var i = visible_ids.length-1; i >= 0; i--) {
if (visible_ids[i] != getActiveArticleId()) {
if (visible_ids[i] != id) {
var e = $("RROW-" + visible_ids[i]);
if (e && e.hasClassName("Unread")) {
@ -1925,7 +1926,20 @@ function initHeadlinesMenu() {
hlOpenInNewTab(event, this.getParent().callerRowId);
}}));
// menu.addChild(new dijit.MenuSeparator());
menu.addChild(new dijit.MenuSeparator());
menu.addChild(new dijit.MenuItem({
label: __("Mark above as read"),
onClick: function(event) {
catchupRelativeToArticle(0, this.getParent().callerRowId);
}}));
menu.addChild(new dijit.MenuItem({
label: __("Mark below as read"),
onClick: function(event) {
catchupRelativeToArticle(1, this.getParent().callerRowId);
}}));
var labels = dijit.byId("feedTree").model.getItemsInCategory(-2);