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

fix name display in catchup prompt in category view mode

This commit is contained in:
Andrew Dolgov 2006-08-01 05:59:21 +01:00
parent d6e5706d7e
commit 234e467cad
3 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend.php
View File

@ -389,7 +389,7 @@
$cat_id = sprintf("%d", $cat_id); $cat_id = sprintf("%d", $cat_id);
print "<li class=\"feedCat\" id=\"FCAT-$cat_id\"> print "<li class=\"feedCat\" id=\"FCAT-$cat_id\">
<a href=\"javascript:toggleCollapseCat($cat_id)\">$tmp_category</a> <a id=\"FCATN-$cat_id\" href=\"javascript:toggleCollapseCat($cat_id)\">$tmp_category</a>
<a href=\"javascript:viewCategory($cat_id)\" id=\"FCAP-$cat_id\"> <a href=\"javascript:viewCategory($cat_id)\" id=\"FCAP-$cat_id\">
<span id=\"FCATCTR-$cat_id\" <span id=\"FCATCTR-$cat_id\"
class=\"$catctr_class\">($cat_unread unread)$ellipsis</span> class=\"$catctr_class\">($cat_unread unread)$ellipsis</span>

11
functions.js
View File

@ -1363,9 +1363,16 @@ function fatalError(code, message) {
} }
} }
function getFeedName(id) { function getFeedName(id, is_cat) {
var d = getFeedsContext().document; var d = getFeedsContext().document;
var e = d.getElementById("FEEDN-" + id);
var e;
if (is_cat) {
e = d.getElementById("FCATN-" + id);
} else {
e = d.getElementById("FEEDN-" + id);
}
if (e) { if (e) {
return e.innerHTML.stripTags(); return e.innerHTML.stripTags();
} else { } else {

10
tt-rss.js
View File

@ -559,9 +559,15 @@ function parse_runtime_info(elem) {
function catchupCurrentFeed() { function catchupCurrentFeed() {
var fn = getFeedName(getActiveFeedId()); var fn = getFeedName(getActiveFeedId(), active_feed_is_cat);
if (confirm("Mark all articles in " + fn + " as read?")) { var str = "Mark all articles in " + fn + " as read?";
/* if (active_feed_is_cat) {
str = "Mark all articles in this category as read?";
} */
if (confirm(str)) {
return viewCurrentFeed(0, 'MarkAllRead') return viewCurrentFeed(0, 'MarkAllRead')
} }
} }