update title of active feed in feedlist on the fly
This commit is contained in:
parent
c2f8aac431
commit
4ffa126ec3
3 changed files with 17 additions and 6 deletions
|
@ -244,7 +244,7 @@
|
||||||
if ($_GET["debug"]) $timing_info = print_checkpoint("20", $timing_info);
|
if ($_GET["debug"]) $timing_info = print_checkpoint("20", $timing_info);
|
||||||
|
|
||||||
print "<counters>";
|
print "<counters>";
|
||||||
getAllCounters($link, $omode);
|
getAllCounters($link, $omode, $feed);
|
||||||
print "</counters>";
|
print "</counters>";
|
||||||
|
|
||||||
if ($_GET["debug"]) $timing_info = print_checkpoint("30", $timing_info);
|
if ($_GET["debug"]) $timing_info = print_checkpoint("30", $timing_info);
|
||||||
|
|
|
@ -596,7 +596,8 @@ function parse_counters(reply, scheduled_call) {
|
||||||
var error = elems[l].getAttribute("error");
|
var error = elems[l].getAttribute("error");
|
||||||
var has_img = elems[l].getAttribute("hi");
|
var has_img = elems[l].getAttribute("hi");
|
||||||
var updated = elems[l].getAttribute("updated");
|
var updated = elems[l].getAttribute("updated");
|
||||||
|
var title = elems[l].getAttribute("title");
|
||||||
|
|
||||||
if (id == "global-unread") {
|
if (id == "global-unread") {
|
||||||
global_unread = ctr;
|
global_unread = ctr;
|
||||||
updateTitle();
|
updateTitle();
|
||||||
|
@ -650,6 +651,10 @@ function parse_counters(reply, scheduled_call) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (feedlink && title) {
|
||||||
|
feedlink.innerHTML = title;
|
||||||
|
}
|
||||||
|
|
||||||
if (feedctr && feedu && feedr) {
|
if (feedctr && feedu && feedr) {
|
||||||
|
|
||||||
if (feedu.innerHTML != ctr && id == getActiveFeedId() && scheduled_call) {
|
if (feedu.innerHTML != ctr && id == getActiveFeedId() && scheduled_call) {
|
||||||
|
|
|
@ -1866,7 +1866,7 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function getAllCounters($link, $omode = "flc") {
|
function getAllCounters($link, $omode = "flc", $active_feed = false) {
|
||||||
/* getLabelCounters($link);
|
/* getLabelCounters($link);
|
||||||
getFeedCounters($link);
|
getFeedCounters($link);
|
||||||
getTagCounters($link);
|
getTagCounters($link);
|
||||||
|
@ -1880,7 +1880,7 @@
|
||||||
getGlobalCounters($link);
|
getGlobalCounters($link);
|
||||||
|
|
||||||
if (strchr($omode, "l")) getLabelCounters($link);
|
if (strchr($omode, "l")) getLabelCounters($link);
|
||||||
if (strchr($omode, "f")) getFeedCounters($link);
|
if (strchr($omode, "f")) getFeedCounters($link, SMART_RPC_COUNTERS, $active_feed);
|
||||||
if (strchr($omode, "t")) getTagCounters($link);
|
if (strchr($omode, "t")) getTagCounters($link);
|
||||||
if (strchr($omode, "c")) {
|
if (strchr($omode, "c")) {
|
||||||
if (get_pref($link, 'ENABLE_FEED_CATS')) {
|
if (get_pref($link, 'ENABLE_FEED_CATS')) {
|
||||||
|
@ -2268,7 +2268,7 @@
|
||||||
print "<counter type=\"feed\" id=\"$id\" counter=\"$count\" error=\"$last_error\"/>";
|
print "<counter type=\"feed\" id=\"$id\" counter=\"$count\" error=\"$last_error\"/>";
|
||||||
} */
|
} */
|
||||||
|
|
||||||
function getFeedCounters($link, $smart_mode = SMART_RPC_COUNTERS) {
|
function getFeedCounters($link, $smart_mode = SMART_RPC_COUNTERS, $active_feed = false) {
|
||||||
|
|
||||||
$age_qpart = getMaxAgeSubquery();
|
$age_qpart = getMaxAgeSubquery();
|
||||||
|
|
||||||
|
@ -2355,7 +2355,13 @@
|
||||||
$has_img_part = "";
|
$has_img_part = "";
|
||||||
}
|
}
|
||||||
|
|
||||||
print "<counter type=\"feed\" id=\"$id\" counter=\"$count\" $has_img_part $error_part updated=\"$last_updated\"/>";
|
if ($active_feed && $id == $active_feed) {
|
||||||
|
$has_title_part = "title=\"" . htmlspecialchars($line["title"]) . "\"";
|
||||||
|
} else {
|
||||||
|
$has_title_part = "";
|
||||||
|
}
|
||||||
|
|
||||||
|
print "<counter type=\"feed\" id=\"$id\" counter=\"$count\" $has_img_part $error_part updated=\"$last_updated\" $has_title_part/>";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue