From 752587bccad186db28df673f84690eb265ecd991 Mon Sep 17 00:00:00 2001
From: thlo <smarttv640@gmail.com>
Date: Sun, 1 Sep 2013 16:53:29 +0200
Subject: Timer menu entry, which gives an overview of the timers and allows
 deletion of timers. widget.conf configurable InfoOverlay timeout (new
 widget.conf entry <infoTimeout>) YouTube entry becomes optional. Add
 <youtubemenu>true</youtubemenu>  to your widget.conf Improved server error
 feedback through widget GUI Bug Fixes.

---
 smarttv-client/Javascript/Config.js | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

(limited to 'smarttv-client/Javascript/Config.js')

diff --git a/smarttv-client/Javascript/Config.js b/smarttv-client/Javascript/Config.js
index e32b74a..0583262 100755
--- a/smarttv-client/Javascript/Config.js
+++ b/smarttv-client/Javascript/Config.js
@@ -20,11 +20,13 @@ var Config = {
 	usePdlForRecordings : true,
 	uploadJsFile : "",
 	directAcessTimeout : 1500,
+	infoTimeout : 3000,
 	preferredQuality : 2,
 	widgetVersion : "unknown",
 	tzCorrection : 0,
 	recSortType : 0,
 	playKeyBehavior : 0,
+	haveYouTube : false,
 	deviceType : 0   // Used to differentiate between browsers and platforms
 	// 0: Samsung
 
@@ -148,6 +150,10 @@ Config.fetchConfig = function () {
         	Config.usePdlForRecordings = ($(data).find('usePdlForRecordings').text() == "false") ? false : true;
         	Config.uploadJsFile = $(data).find('uploadJsFile').text();
         	Config.directAcessTimeout = $(data).find('directAcessTimeout').text();
+
+        	Config.infoTimeout = parseInt( $(data).find('infoTimeout').text());
+        	Config.infoTimeout = isNaN(Config.infoTimeout) ? 3000 : Config.infoTimeout;
+        	
         	Config.preferredQuality = $(data).find('preferredQuality').text();
         	Config.sortType= parseInt($(data).find('sortType').text());
         	if ((Config.sortType < 0) || (Config.sortType > Data.maxSort) || isNaN(Config.sortType)) {
@@ -155,7 +161,8 @@ Config.fetchConfig = function () {
         	}
         	Config.playKeyBehavior = parseInt($(data).find('playKeyBehavior').text());
         	Config.playKeyBehavior = isNaN(Config.playKeyBehavior) ? 0 : Config.playKeyBehavior;
-        	
+			Config.haveYouTube = ($(data).find('youtubemenu').text() == "true") ? true : false
+			
         	Player.skipDuration = Config.skipDuration;
         	if (Config.directAcessTimeout != "") {
         		DirectAccess.delay = Config.directAcessTimeout;
@@ -360,7 +367,10 @@ VdrServers.prototype.handleResponse = function () {
 	Main.log ("handle responses: Response " + this.responses + " of " + this.serverUrlList.length);  	
 	this.responses ++;
 	if (this.responses == this.serverUrlList.length) {
-		Main.log ("handle responses: Done. Active Servers= " + this.activeServers.length);  
+		Main.log ("handle responses: Done. Active Servers= " + this.activeServers.length); 
+		
+		SelectScreen.resetElements();
+
 		switch (this.activeServers.length) {
 		case 0:
 			this.retries ++;
-- 
cgit v1.2.3