From ad1ba059f537239c7c9585dec4b813384adafe21 Mon Sep 17 00:00:00 2001
From: Dieter Hametner <dh (plus) vdr (at) gekrumbel (dot) de>
Date: Wed, 13 Jun 2007 22:11:44 +0000
Subject: - show 'user friendly' error message in infobox. Fixes #315 - Tooltip
 text now independant of update state. Fixes #328

---
 javascript/vdr_status.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'javascript')

diff --git a/javascript/vdr_status.js b/javascript/vdr_status.js
index 158bc1a..73a20dd 100644
--- a/javascript/vdr_status.js
+++ b/javascript/vdr_status.js
@@ -136,15 +136,17 @@ function LiveStatusRequest(url, containerid)
 				LiveStatusShowInfo(this.xml.responseXML, containerid);
 			}
 			catch (e) {
-				LiveStatusReportError(e.message, containerid);
+				var updateMsg = document.getElementById("__infobox_update_err").firstChild.nodeValue;
+				LiveStatusReportError(updateMsg, containerid);
 			}
 			if (vst_reload)
 				vst_timer = window.setTimeout("LiveStatusRequest('" + url + "', '" + containerid + "')", 1000);
 		}
 	status.onerror = function(message)
 		{
+			var requestMsg = document.getElementById("__infobox_request_err").firstChild.nodeValue;
 			LiveStatusToggleUpdate();
- 			LiveStatusReportError(message, containerid);
+ 			LiveStatusReportError(requestMsg, containerid);
 		}
 	status.request("update", vst_reload ? "1" : "0");
 }
-- 
cgit v1.2.3