hide updating... notify if DAEMON_REFRESH_ONLY
This commit is contained in:
parent
e8614131e8
commit
0d51e25dfb
|
@ -1719,6 +1719,7 @@
|
||||||
|
|
||||||
print "<param key=\"daemon_enabled\" value=\"" . ENABLE_UPDATE_DAEMON . "\"/>";
|
print "<param key=\"daemon_enabled\" value=\"" . ENABLE_UPDATE_DAEMON . "\"/>";
|
||||||
print "<param key=\"feeds_frame_refresh\" value=\"" . FEEDS_FRAME_REFRESH . "\"/>";
|
print "<param key=\"feeds_frame_refresh\" value=\"" . FEEDS_FRAME_REFRESH . "\"/>";
|
||||||
|
print "<param key=\"daemon_refresh_only\" value=\"" . DAEMON_REFRESH_ONLY . "\"/>";
|
||||||
|
|
||||||
print "<param key=\"on_catchup_show_next_feed\" value=\"" .
|
print "<param key=\"on_catchup_show_next_feed\" value=\"" .
|
||||||
get_pref($link, "ON_CATCHUP_SHOW_NEXT_FEED") . "\"/>";
|
get_pref($link, "ON_CATCHUP_SHOW_NEXT_FEED") . "\"/>";
|
||||||
|
|
|
@ -6,6 +6,7 @@ var global_unread = -1;
|
||||||
var active_title_text = "";
|
var active_title_text = "";
|
||||||
var current_subtitle = "";
|
var current_subtitle = "";
|
||||||
var daemon_enabled = false;
|
var daemon_enabled = false;
|
||||||
|
var daemon_refresh_only = false;
|
||||||
var _qfd_deleted_feed = 0;
|
var _qfd_deleted_feed = 0;
|
||||||
var firsttime_update = true;
|
var firsttime_update = true;
|
||||||
var last_refetch = 0;
|
var last_refetch = 0;
|
||||||
|
@ -81,7 +82,7 @@ function refetch_callback() {
|
||||||
|
|
||||||
debug("refetch_callback: done");
|
debug("refetch_callback: done");
|
||||||
|
|
||||||
if (!daemon_enabled) {
|
if (!daemon_enabled && !daemon_refresh_only) {
|
||||||
notify("All feeds updated.");
|
notify("All feeds updated.");
|
||||||
updateTitle("");
|
updateTitle("");
|
||||||
} else {
|
} else {
|
||||||
|
@ -145,7 +146,7 @@ function backend_sanity_check_callback() {
|
||||||
|
|
||||||
function scheduleFeedUpdate(force) {
|
function scheduleFeedUpdate(force) {
|
||||||
|
|
||||||
if (!daemon_enabled) {
|
if (!daemon_enabled && !daemon_refresh_only) {
|
||||||
notify("Updating feeds, please wait.", true);
|
notify("Updating feeds, please wait.", true);
|
||||||
updateTitle("Updating");
|
updateTitle("Updating");
|
||||||
}
|
}
|
||||||
|
@ -397,7 +398,8 @@ function init_second_stage() {
|
||||||
dropboxSelect(tb.view_mode, getInitParam("toolbar_view_mode"));
|
dropboxSelect(tb.view_mode, getInitParam("toolbar_view_mode"));
|
||||||
dropboxSelect(tb.limit, getInitParam("toolbar_limit"));
|
dropboxSelect(tb.limit, getInitParam("toolbar_limit"));
|
||||||
|
|
||||||
daemon_enabled = getInitParam("daemon_enabled");
|
daemon_enabled = getInitParam("daemon_enabled") == 1;
|
||||||
|
daemon_refresh_only = getInitParam("daemon_refresh_only") == 1;
|
||||||
|
|
||||||
// FIXME should be callled after window resize
|
// FIXME should be callled after window resize
|
||||||
|
|
||||||
|
|
|
@ -213,7 +213,7 @@ window.onload = init;
|
||||||
<!-- <option>Edit this feed</option> -->
|
<!-- <option>Edit this feed</option> -->
|
||||||
<option disabled>--------</option>
|
<option disabled>--------</option>
|
||||||
<option style="color : #5050aa" disabled>All feeds:</option>
|
<option style="color : #5050aa" disabled>All feeds:</option>
|
||||||
<? if (!ENABLE_UPDATE_DAEMON) { ?>
|
<? if (!ENABLE_UPDATE_DAEMON && !DAEMON_REFRESH_ONLY) { ?>
|
||||||
<option value="qmcUpdateFeeds"> Update</option>
|
<option value="qmcUpdateFeeds"> Update</option>
|
||||||
<? } ?>
|
<? } ?>
|
||||||
<option value="qmcCatchupAll"> Mark as read</option>
|
<option value="qmcCatchupAll"> Mark as read</option>
|
||||||
|
|
Loading…
Reference in New Issue