valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rework the way headlines menus identify calling row

This commit is contained in:
Andrew Dolgov 2017-02-17 09:01:45 +03:00
parent 3102a1b338
commit b835a52814
2 changed files with 18 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
classes/feeds.php
View File

@ -611,9 +611,11 @@ class Feeds extends Handler_Protected {
}
}
// data-article-id included for context menu
$reply['content'] .= "<span id=\"RTITLE-$id\"
onclick=\"return cdmClicked(event, $id);\"
class=\"titleWrap hlMenuAttach $hlc_suffix\">
data-article-id=\"$id\"
class=\"titleWrap hlMenuAttach $hlc_suffix\">
<a class=\"title $hlc_suffix\"
title=\"".htmlspecialchars($line["title"])."\"
target=\"_blank\" rel=\"noopener noreferrer\" href=\"".

68
js/viewfeed.js
View File

@ -1830,19 +1830,6 @@ function initFloatingMenu() {
targetNodeIds: ["floatingTitle"]
});
var tmph = dojo.connect(menu, '_openMyself', function (event) {
var callerNode = event.target, match = null, tries = 0;
while (match == null && callerNode && tries <= 3) {
match = callerNode.getAttribute("data-article-id");
callerNode = callerNode.parentNode;
++tries;
}
if (match) this.callerRowId = match;
});
headlinesMenuCommon(menu);
menu.startup();
@ -1859,13 +1846,13 @@ function headlinesMenuCommon(menu) {
menu.addChild(new dijit.MenuItem({
label: __("Open original article"),
onClick: function(event) {
openArticleInNewWindow(this.getParent().callerRowId);
openArticleInNewWindow(this.getParent().currentTarget.getAttribute("data-article-id"));
}}));
menu.addChild(new dijit.MenuItem({
label: __("Display article URL"),
onClick: function(event) {
displayArticleUrl(this.getParent().callerRowId);
displayArticleUrl(this.getParent().currentTarget.getAttribute("data-article-id"));
}}));
menu.addChild(new dijit.MenuSeparator());
@ -1873,9 +1860,10 @@ function headlinesMenuCommon(menu) {
menu.addChild(new dijit.MenuItem({
label: __("Toggle unread"),
onClick: function(event) {
var ids = getSelectedArticleIds2();
// cast to string
var id = (this.getParent().callerRowId) + "";
var id = (this.getParent().currentTarget.getAttribute("data-article-id")) + "";
ids = ids.size() != 0 && ids.indexOf(id) != -1 ? ids : [id];
selectionToggleUnread(undefined, false, true, ids);
@ -1886,7 +1874,7 @@ function headlinesMenuCommon(menu) {
onClick: function(event) {
var ids = getSelectedArticleIds2();
// cast to string
var id = (this.getParent().callerRowId) + "";
var id = (this.getParent().currentTarget.getAttribute("data-article-id")) + "";
ids = ids.size() != 0 && ids.indexOf(id) != -1 ? ids : [id];
selectionToggleMarked(undefined, false, true, ids);
@ -1897,7 +1885,7 @@ function headlinesMenuCommon(menu) {
onClick: function(event) {
var ids = getSelectedArticleIds2();
// cast to string
var id = (this.getParent().callerRowId) + "";
var id = (this.getParent().currentTarget.getAttribute("data-article-id")) + "";
ids = ids.size() != 0 && ids.indexOf(id) != -1 ? ids : [id];
selectionTogglePublished(undefined, false, true, ids);
@ -1908,13 +1896,13 @@ function headlinesMenuCommon(menu) {
menu.addChild(new dijit.MenuItem({
label: __("Mark above as read"),
onClick: function(event) {
catchupRelativeToArticle(0, this.getParent().callerRowId);
catchupRelativeToArticle(0, this.getParent().currentTarget.getAttribute("data-article-id"));
}}));
menu.addChild(new dijit.MenuItem({
label: __("Mark below as read"),
onClick: function(event) {
catchupRelativeToArticle(1, this.getParent().callerRowId);
catchupRelativeToArticle(1, this.getParent().currentTarget.getAttribute("data-article-id"));
}}));
@ -1938,9 +1926,10 @@ function headlinesMenuCommon(menu) {
label: name,
labelId: bare_id,
onClick: function(event) {
var ids = getSelectedArticleIds2();
// cast to string
var id = (this.getParent().ownerMenu.callerRowId) + "";
var id = (this.getParent().ownerMenu.currentTarget.getAttribute("data-article-id")) + "";
ids = ids.size() != 0 && ids.indexOf(id) != -1 ? ids : [id];
@ -1953,7 +1942,7 @@ function headlinesMenuCommon(menu) {
onClick: function(event) {
var ids = getSelectedArticleIds2();
// cast to string
var id = (this.getParent().ownerMenu.callerRowId) + "";
var id = (this.getParent().ownerMenu.currentTarget.getAttribute("data-article-id")) + "";
ids = ids.size() != 0 && ids.indexOf(id) != -1 ? ids : [id];
@ -1990,20 +1979,6 @@ function initHeadlinesMenu() {
selector: ".hlMenuAttach"
});
var tmph = dojo.connect(menu, '_openMyself', function (event) {
var callerNode = event.target, match = null, tries = 0;
while (match == null && callerNode && tries <= 3) {
match = callerNode.getAttribute("data-article-id")
callerNode = callerNode.parentNode;
++tries;
}
if (match) this.callerRowId = match;
});
headlinesMenuCommon(menu);
menu.startup();
@ -2019,25 +1994,12 @@ function initHeadlinesMenu() {
selector: "div.cdmFeedTitle"
});
var tmph = dojo.connect(menu, '_openMyself', function (event) {
var callerNode = event.target, match = null, tries = 0;
while (match == null && callerNode && tries <= 3) {
match = callerNode.getAttribute("data-feed-id")
callerNode = callerNode.parentNode;
++tries;
}
if (match) this.callerRowId = match;
});
menu.addChild(new dijit.MenuItem({
label: __("Select articles in group"),
onClick: function (event) {
selectArticles("all",
"#headlines-frame > div[id*=RROW]" +
"[data-orig-feed-id='" + menu.callerRowId + "']");
"[data-orig-feed-id='" + this.getParent().currentTarget.getAttribute("data-feed-id") + "']");
}
}));
@ -2048,7 +2010,7 @@ function initHeadlinesMenu() {
selectArticles("none");
selectArticles("all",
"#headlines-frame > div[id*=RROW]" +
"[data-orig-feed-id='" + menu.callerRowId + "']");
"[data-orig-feed-id='" + this.getParent().currentTarget.getAttribute("data-feed-id") + "']");
catchupSelection();
}
@ -2057,14 +2019,14 @@ function initHeadlinesMenu() {
menu.addChild(new dijit.MenuItem({
label: __("Mark feed as read"),
onClick: function (event) {
catchupFeedInGroup(menu.callerRowId);
catchupFeedInGroup(this.getParent().currentTarget.getAttribute("data-feed-id"));
}
}));
menu.addChild(new dijit.MenuItem({
label: __("Edit feed"),
onClick: function (event) {
editFeed(menu.callerRowId);
editFeed(this.getParent().currentTarget.getAttribute("data-feed-id"));
}
}));