From: Andrew Dolgov <fox@bah.spb.su>
Date: Thu, 18 May 2006 12:32:28 +0000 (+0100)
Subject: make updating feeds notify persistent, remove p_notify calls
X-Git-Tag: 1.2.0~83
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=4d4200a87b0b5005373411b2a6757324ad9af077;p=tt-rss.git

make updating feeds notify persistent, remove p_notify calls
---

diff --git a/functions.js b/functions.js
index bcbc93b3..1914855d 100644
--- a/functions.js
+++ b/functions.js
@@ -93,7 +93,7 @@ function hide_notify() {
 	}
 }
 
-function notify_real(msg, doc) {
+function notify_real(msg, doc, no_hide) {
 
 	var n = doc.getElementById("notify");
 	var nb = doc.getElementById("notify_body");
@@ -115,15 +115,17 @@ function notify_real(msg, doc) {
 	notify_last_doc = doc;
 	notify_opacity = 1;
 
-	notify_hide_timerid = window.setTimeout(hide_notify, 3000);
+	if (!no_hide) {
+		notify_hide_timerid = window.setTimeout(hide_notify, 3000);
+	}
 }
 
-function p_notify(msg) {
-	notify_real(msg, parent.document);
+function p_notify(msg, no_hide) {
+	notify_real(msg, parent.document, no_hide);
 }
 
-function notify(msg) {
-	notify_real(msg, document);
+function notify(msg, no_hide) {
+	notify_real(msg, document, no_hide);
 }
 
 function printLockingError() {
diff --git a/prefs.js b/prefs.js
index 11bcad6f..aa0d0a2e 100644
--- a/prefs.js
+++ b/prefs.js
@@ -36,7 +36,7 @@ function expand_feed_callback() {
 			var container = document.getElementById("BRDET-" + feed_to_expand);	
 			container.innerHTML=xmlhttp.responseText;
 			container.style.display = "block";
-			p_notify("");
+//			p_notify("");
 		} catch (e) {
 			exception_error("expand_feed_callback", e);
 		}
@@ -62,7 +62,7 @@ function feedlist_callback() {
 					checkbox.checked = true;
 				}
 			}
-			p_notify("");
+//			p_notify("");
 		} catch (e) {
 			exception_error("feedlist_callback", e);
 		}
@@ -88,7 +88,7 @@ function filterlist_callback() {
 				checkbox.checked = true;
 			}
 		}
-		p_notify("");
+//		p_notify("");
 	}
 }
 
@@ -110,7 +110,7 @@ function labellist_callback() {
 				checkbox.checked = true;
 			}
 		}
-		p_notify("");
+//		p_notify("");
 	}
 }
 
@@ -118,7 +118,7 @@ function feed_browser_callback() {
 	var container = document.getElementById('prefContent');
 	if (xmlhttp.readyState == 4) {
 		container.innerHTML=xmlhttp.responseText;
-		p_notify("");
+//		p_notify("");
 	}
 }
 
@@ -141,7 +141,7 @@ function userlist_callback() {
 			}
 		} 
 
-		p_notify("");
+//		p_notify("");
 	}
 }
 
@@ -151,7 +151,7 @@ function prefslist_callback() {
 
 		container.innerHTML=xmlhttp.responseText;
 
-		p_notify("");
+//		p_notify("");
 	}
 }
 
diff --git a/tt-rss.js b/tt-rss.js
index 254d9af8..3fc7c0eb 100644
--- a/tt-rss.js
+++ b/tt-rss.js
@@ -166,7 +166,7 @@ function backend_sanity_check_callback() {
 function scheduleFeedUpdate(force) {
 
 	if (!daemon_enabled) {
-		notify("Updating feeds, please wait.");
+		notify("Updating feeds, please wait.", true);
 		updateTitle("Updating");
 	}