servers/ttrss
1
0
Fork 0
mirror of https://tt-rss.org/git/tt-rss.git synced 2024-06-27 12:05:06 +02:00
Code Issues Releases Wiki Activity

Headlines: shorten selectArticles

Browse Source
This commit is contained in:
Andrew Dolgov 2018-12-02 08:34:08 +03:00
parent 3678315bea
commit 6e625555c9
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
classes/feeds.php
View File

@ -20,10 +20,10 @@ class Feeds extends Handler_Protected {
$archive_sel_link = "Headlines.archiveSelection()"; $archive_sel_link = "Headlines.archiveSelection()";
$delete_sel_link = "Headlines.deleteSelection()"; $delete_sel_link = "Headlines.deleteSelection()";
$sel_all_link = "Headlines.selectArticles('all')"; $sel_all_link = "Headlines.select('all')";
$sel_unread_link = "Headlines.selectArticles('unread')"; $sel_unread_link = "Headlines.select('unread')";
$sel_none_link = "Headlines.selectArticles('none')"; $sel_none_link = "Headlines.select('none')";
$sel_inv_link = "Headlines.selectArticles('invert')"; $sel_inv_link = "Headlines.select('invert')";
$tog_unread_link = "Headlines.selectionToggleUnread()"; $tog_unread_link = "Headlines.selectionToggleUnread()";
$tog_marked_link = "Headlines.selectionToggleMarked()"; $tog_marked_link = "Headlines.selectionToggleMarked()";

12
js/tt-rss.js
View File

@ -315,22 +315,22 @@ const App = {
} }
}; };
this.hotkey_actions["select_all"] = function () { this.hotkey_actions["select_all"] = function () {
Headlines.selectArticles('all'); Headlines.select('all');
}; };
this.hotkey_actions["select_unread"] = function () { this.hotkey_actions["select_unread"] = function () {
Headlines.selectArticles('unread'); Headlines.select('unread');
}; };
this.hotkey_actions["select_marked"] = function () { this.hotkey_actions["select_marked"] = function () {
Headlines.selectArticles('marked'); Headlines.select('marked');
}; };
this.hotkey_actions["select_published"] = function () { this.hotkey_actions["select_published"] = function () {
Headlines.selectArticles('published'); Headlines.select('published');
}; };
this.hotkey_actions["select_invert"] = function () { this.hotkey_actions["select_invert"] = function () {
Headlines.selectArticles('invert'); Headlines.select('invert');
}; };
this.hotkey_actions["select_none"] = function () { this.hotkey_actions["select_none"] = function () {
Headlines.selectArticles('none'); Headlines.select('none');
}; };
this.hotkey_actions["feed_refresh"] = function () { this.hotkey_actions["feed_refresh"] = function () {
if (Feeds.getActiveFeedId() != undefined) { if (Feeds.getActiveFeedId() != undefined) {

10
js/viewfeed.js
View File

@ -1109,7 +1109,7 @@ const Headlines = {
return rv; return rv;
}, },
selectArticles: function(mode) { select: function(mode) {
// mode = all,none,unread,invert,marked,published // mode = all,none,unread,invert,marked,published
let query = "#headlines-frame > div[id*=RROW]"; let query = "#headlines-frame > div[id*=RROW]";
@ -1128,7 +1128,7 @@ const Headlines = {
query += "[class*=Unread]"; query += "[class*=Unread]";
break; break;
default: default:
console.warn("selectArticles: unknown mode", mode); console.warn("select: unknown mode", mode);
} }
const rows = $$(query); const rows = $$(query);
@ -1522,7 +1522,7 @@ const Headlines = {
menu.addChild(new dijit.MenuItem({ menu.addChild(new dijit.MenuItem({
label: __("Select articles in group"), label: __("Select articles in group"),
onClick: function (event) { onClick: function (event) {
Headlines.selectArticles("all", Headlines.select("all",
"#headlines-frame > div[id*=RROW]" + "#headlines-frame > div[id*=RROW]" +
"[data-orig-feed-id='" + this.getParent().currentTarget.getAttribute("data-feed-id") + "']"); "[data-orig-feed-id='" + this.getParent().currentTarget.getAttribute("data-feed-id") + "']");
@ -1532,8 +1532,8 @@ const Headlines = {
menu.addChild(new dijit.MenuItem({ menu.addChild(new dijit.MenuItem({
label: __("Mark group as read"), label: __("Mark group as read"),
onClick: function () { onClick: function () {
Headlines.selectArticles("none"); Headlines.select("none");
Headlines.selectArticles("all", Headlines.select("all",
"#headlines-frame > div[id*=RROW]" + "#headlines-frame > div[id*=RROW]" +
"[data-orig-feed-id='" + this.getParent().currentTarget.getAttribute("data-feed-id") + "']"); "[data-orig-feed-id='" + this.getParent().currentTarget.getAttribute("data-feed-id") + "']");