From f4280bdd13e1a1ad54f6ddfafaccdc0e43aa756e Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@bah.org.ru>
Date: Fri, 9 Oct 2009 14:30:21 +0400
Subject: feed browser: add local spinner

---
 functions.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'functions.js')

diff --git a/functions.js b/functions.js
index 6ab23b0f2..22490fd1c 100644
--- a/functions.js
+++ b/functions.js
@@ -2052,12 +2052,16 @@ function updateFeedBrowser() {
 			query = query + "&search=" + param_escape(search.value);
 		}
 
-		notify_progress("Loading, please wait...", true);
+		//notify_progress("Loading, please wait...", true);
+
+		Element.show('feed_browser_spinner');
 
 		new Ajax.Request(query, {
 			onComplete: function(transport) { 
 				notify('');
 
+				Element.hide('feed_browser_spinner');
+
 				var c = $("browseFeedList");
 				var r = transport.responseXML.getElementsByTagName("content")[0];
 				var nr = transport.responseXML.getElementsByTagName("num-results")[0];
-- 
cgit v1.2.3-54-g00ecf


From 37e93d6ccae51c283f3b480195016d749ecab1a5 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@bah.org.ru>
Date: Tue, 13 Oct 2009 19:05:36 +0400
Subject: display special dialog when new articles are available in the current
 feed instead of reloading it

---
 feedlist.js  |  2 +-
 functions.js | 23 ++++++++++++++++++++++-
 tt-rss.css   | 18 ++++++++++++++++++
 tt-rss.php   |  1 +
 4 files changed, 42 insertions(+), 2 deletions(-)

(limited to 'functions.js')

diff --git a/feedlist.js b/feedlist.js
index 860122bd0..bfd14376c 100644
--- a/feedlist.js
+++ b/feedlist.js
@@ -157,7 +157,7 @@ function viewfeed(feed, subop, is_cat, subop_param, skip_history, offset) {
 		}
 
 		enableHotkeys();
-
+		hideAuxDlg();
 		closeInfoBox();
 
 		Form.enable("main_toolbar_form");
diff --git a/functions.js b/functions.js
index 22490fd1c..fcfddaa52 100644
--- a/functions.js
+++ b/functions.js
@@ -532,7 +532,7 @@ function parse_counters(reply, scheduled_call) {
 			if (feedctr && feedu && feedr) {
 
 				if (feedu.innerHTML != ctr && id == getActiveFeedId() && scheduled_call) {
-					viewCurrentFeed();
+					displayNewContentPrompt(id);
 				}
 
 				var row_needs_hl = (ctr > 0 && ctr > parseInt(feedu.innerHTML));
@@ -2194,4 +2194,25 @@ function hotkey_prefix_timeout() {
 	}
 }
 
+function hideAuxDlg() {
+	try {
+		Element.hide('auxDlg');
+	} catch (e) {
+		exception_error("hideAuxDlg", e);
+	}
+}
+
+function displayNewContentPrompt(id) {
+	try {
+		var msg = __("New articles in &laquo;%s&raquo;. <a href='#' onclick='viewCurrentFeed()'>Click to view</a>.");
 
+		msg = msg.replace("%s", getFeedName(id));
+
+		$('auxDlg').innerHTML = msg;
+
+		Element.show('auxDlg');
+
+	} catch (e) {
+		exception_error("displayNewContentPrompt", e);
+	}
+}
diff --git a/tt-rss.css b/tt-rss.css
index 4510ad705..a41d49d79 100644
--- a/tt-rss.css
+++ b/tt-rss.css
@@ -2238,3 +2238,21 @@ div#cmdline {
 	height : 18px;
 	width : 18px;
 }
+
+div#auxDlg {
+	position : absolute;
+	z-index : 3;
+	bottom : 10px;
+	right : 10px;
+	padding : 5px;
+	border-width : 1px;
+	border-style : solid;
+	border-color : #d7c47a;
+	background-color : #fff7d5;
+	color : black;
+	text-align : center;
+}
+
+div#auxDlg a {
+	color : #4684ff;
+}
diff --git a/tt-rss.php b/tt-rss.php
index 1dcee23a4..7b87c320f 100644
--- a/tt-rss.php
+++ b/tt-rss.php
@@ -105,6 +105,7 @@ window.onload = init;
 <div id="infoBoxShadow" style="display : none"><div id="infoBox">&nbsp;</div></div>
 
 <div id="cmdline" style="display : none"></div>
+<div id="auxDlg" style="zdisplay : none"></div>
 
 <div id="errorBoxShadow" style="display : none">
 	<div id="errorBox">
-- 
cgit v1.2.3-54-g00ecf