fix name display in catchup prompt in category view mode

master
Andrew Dolgov 18 years ago
parent d6e5706d7e
commit 234e467cad

@ -389,7 +389,7 @@
$cat_id = sprintf("%d", $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\">
<span id=\"FCATCTR-$cat_id\"
class=\"$catctr_class\">($cat_unread unread)$ellipsis</span>

@ -1363,9 +1363,16 @@ function fatalError(code, message) {
}
}
function getFeedName(id) {
function getFeedName(id, is_cat) {
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) {
return e.innerHTML.stripTags();
} else {

@ -559,9 +559,15 @@ function parse_runtime_info(elem) {
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')
}
}

Loading…
Cancel
Save