public/tt-rss
1
0
Fork 0
mirror of https://git.tt-rss.org/git/tt-rss.git synced 2025-12-16 01:25:55 +00:00
Code Issues Releases Wiki Activity

implement labels submenu; rework init process so that feedlist_init depends on feedTree being loaded

Browse Source
This commit is contained in:
Andrew Dolgov
2010-11-19 22:18:26 +03:00
parent bc372fe30f
commit 1beea80017
3 changed files with 51 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
viewfeed.js
View File

@@ -669,10 +669,10 @@ function toggleUnread(id, cmode, effect) {
}
}
function selectionRemoveLabel(id) {
function selectionRemoveLabel(id, ids) {
try {
var ids = getSelectedArticleIds2();
if (!ids) var ids = getSelectedArticleIds2();
if (ids.length == 0) {
alert(__("No articles are selected."));
@@ -707,10 +707,10 @@ function selectionRemoveLabel(id) {
}
}
function selectionAssignLabel(id) {
function selectionAssignLabel(id, ids) {
try {
var ids = getSelectedArticleIds2();
if (!ids) ids = getSelectedArticleIds2();
if (ids.length == 0) {
alert(__("No articles are selected."));
@@ -2265,7 +2265,9 @@ function initHeadlinesMenu() {
label: __("View in a new tab"),
onClick: function(event) {
hlOpenInNewTab(event, this.getParent().callerRowId);
}}));
}}));
menu.addChild(new dijit.MenuSeparator());
menu.addChild(new dijit.MenuItem({
label: __("Open original article"),
@@ -2273,6 +2275,38 @@ function initHeadlinesMenu() {
openArticleInNewWindow(this.getParent().callerRowId);
}}));
var labels = dijit.byId("feedTree").model.getItemsInCategory(-2);
if (labels) {
menu.addChild(new dijit.MenuSeparator());
var labelsMenu = new dijit.Menu({ownerMenu: menu});
labels.each(function(label) {
var id = label.id[0];
var bare_id = id.substr(id.indexOf(":")+1);
var name = label.name[0];
bare_id = -11-bare_id;
labelsMenu.addChild(new dijit.MenuItem({
label: name,
labelId: bare_id,
onClick: function(event) {
//console.log(this.labelId);
//console.log(this.getParent().ownerMenu.callerRowId);
selectionAssignLabel(this.labelId,
[this.getParent().ownerMenu.callerRowId]);
}}));
});
menu.addChild(new dijit.PopupMenuItem({
label: __("Labels"),
popup: labelsMenu,
}));
}
menu.startup();
} catch (e) {