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

simplify adding/removing labels manually; simplify headline popup menu

Browse Source
This commit is contained in:
Andrew Dolgov
2011-03-07 15:24:49 +03:00
parent 176b8ba62f
commit 10690c19da
1 changed files with 30 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
viewfeed.js
View File

@@ -2168,20 +2168,12 @@ function initHeadlinesMenu() {
}); });
if (!isCdmMode()) /* if (!isCdmMode())
menu.addChild(new dijit.MenuItem({ menu.addChild(new dijit.MenuItem({
label: __("View article"), label: __("View article"),
onClick: function(event) { onClick: function(event) {
view(this.getParent().callerRowId); view(this.getParent().callerRowId);
}})); }})); */
menu.addChild(new dijit.MenuItem({
label: __("View in a new tab"),
onClick: function(event) {
hlOpenInNewTab(event, this.getParent().callerRowId);
}}));
menu.addChild(new dijit.MenuSeparator());
menu.addChild(new dijit.MenuItem({ menu.addChild(new dijit.MenuItem({
label: __("Open original article"), label: __("Open original article"),
@@ -2189,13 +2181,22 @@ function initHeadlinesMenu() {
openArticleInNewWindow(this.getParent().callerRowId); openArticleInNewWindow(this.getParent().callerRowId);
}})); }}));
menu.addChild(new dijit.MenuItem({
label: __("View in a tt-rss tab"),
onClick: function(event) {
hlOpenInNewTab(event, this.getParent().callerRowId);
}}));
// menu.addChild(new dijit.MenuSeparator());
var labels = dijit.byId("feedTree").model.getItemsInCategory(-2); var labels = dijit.byId("feedTree").model.getItemsInCategory(-2);
if (labels) { if (labels) {
menu.addChild(new dijit.MenuSeparator()); menu.addChild(new dijit.MenuSeparator());
var labelsMenu = new dijit.Menu({ownerMenu: menu}); var labelAddMenu = new dijit.Menu({ownerMenu: menu});
var labelDelMenu = new dijit.Menu({ownerMenu: menu});
labels.each(function(label) { labels.each(function(label) {
var id = label.id[0]; var id = label.id[0];
@@ -2204,21 +2205,34 @@ function initHeadlinesMenu() {
bare_id = -11-bare_id; bare_id = -11-bare_id;
labelsMenu.addChild(new dijit.MenuItem({ labelAddMenu.addChild(new dijit.MenuItem({
label: name, label: name,
labelId: bare_id, labelId: bare_id,
onClick: function(event) { onClick: function(event) {
//console.log(this.labelId);
//console.log(this.getParent().ownerMenu.callerRowId);
selectionAssignLabel(this.labelId, selectionAssignLabel(this.labelId,
[this.getParent().ownerMenu.callerRowId]); [this.getParent().ownerMenu.callerRowId]);
}})); }}));
labelDelMenu.addChild(new dijit.MenuItem({
label: name,
labelId: bare_id,
onClick: function(event) {
selectionRemoveLabel(this.labelId,
[this.getParent().ownerMenu.callerRowId]);
}}));
}); });
menu.addChild(new dijit.PopupMenuItem({ menu.addChild(new dijit.PopupMenuItem({
label: __("Labels"), label: __("Assign label"),
popup: labelsMenu, popup: labelAddMenu,
})); }));
menu.addChild(new dijit.PopupMenuItem({
label: __("Remove label"),
popup: labelDelMenu,
}));
} }
menu.startup(); menu.startup();