hide updating... notify if DAEMON_REFRESH_ONLY

3 files changed, 7 insertions, 4 deletions

diff --git a/functions.php b/functions.php
index 6de5c9eda..ab548c2f6 100644
--- a/functions.php
+++ b/functions.php
@@ -1719,6 +1719,7 @@
 
 		print "<param key=\"daemon_enabled\" value=\"" . ENABLE_UPDATE_DAEMON . "\"/>";
 		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=\"" . 
 			get_pref($link, "ON_CATCHUP_SHOW_NEXT_FEED") . "\"/>";
diff --git a/tt-rss.js b/tt-rss.js
index 7167d0584..fb4248ba9 100644
--- a/tt-rss.js
+++ b/tt-rss.js
@@ -6,6 +6,7 @@ var global_unread = -1;
 var active_title_text = "";
 var current_subtitle = "";
 var daemon_enabled = false;
+var daemon_refresh_only = false;
 var _qfd_deleted_feed = 0;
 var firsttime_update = true;
 var last_refetch = 0;
@@ -81,7 +82,7 @@ function refetch_callback() {
 
 			debug("refetch_callback: done");
 
-			if (!daemon_enabled) {
+			if (!daemon_enabled && !daemon_refresh_only) {
 				notify("All feeds updated.");
 				updateTitle("");
 			} else {
@@ -145,7 +146,7 @@ function backend_sanity_check_callback() {
 
 function scheduleFeedUpdate(force) {
 
-	if (!daemon_enabled) {
+	if (!daemon_enabled && !daemon_refresh_only) {
 		notify("Updating feeds, please wait.", true);
 		updateTitle("Updating");
 	}
@@ -397,7 +398,8 @@ function init_second_stage() {
 		dropboxSelect(tb.view_mode, getInitParam("toolbar_view_mode"));
 		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
 
diff --git a/tt-rss.php b/tt-rss.php
index afc8c14ec..06121c2a1 100644
--- a/tt-rss.php
+++ b/tt-rss.php
@@ -213,7 +213,7 @@ window.onload = init;
 				<!-- <option>Edit this feed</option> -->
 				<option disabled>--------</option>
 				<option style="color : #5050aa" disabled>All feeds:</option>
-				<? if (!ENABLE_UPDATE_DAEMON) { ?>
+				<? if (!ENABLE_UPDATE_DAEMON && !DAEMON_REFRESH_ONLY) { ?>
 				<option value="qmcUpdateFeeds">&nbsp;&nbsp;Update</option>
 				<? } ?>
 				<option value="qmcCatchupAll">&nbsp;&nbsp;Mark as read</option>