From f1384e2bbac69fed20d28be568bb0fda8925c116 Mon Sep 17 00:00:00 2001
From: "M. Voerman" <rekordc@gmail.com>
Date: Wed, 11 Feb 2015 20:07:52 +0100
Subject: weather menu show, waiting and errormessage in case of error

---
 javascript/main.js     | 3 ++-
 javascript/settings.js | 2 +-
 javascript/weather.js  | 6 +++---
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/javascript/main.js b/javascript/main.js
index d8be2a4..72998c0 100644
--- a/javascript/main.js
+++ b/javascript/main.js
@@ -2457,8 +2457,9 @@ function onKeyMenu(keyCode) {
     break;
     case "Green":
 	if (menu == MainMenu) {
+		mainmenu.innerHTML = "<h1 class=mainmenu" + cssres[css_nr][Set_Res] + ">" + Lang[0] + "</h1>";
 		menu = 11; // Weather menu
-		InitMenu(menu);
+		setTimeout("InitMenu(menu);",100);
 	} else if (menu == 1) {
 		Set_Res++;
 		if (Set_Res > (VideoOutputModes.length-1)) { Set_Res = 0;}
diff --git a/javascript/settings.js b/javascript/settings.js
index 9a564bf..e31f683 100644
--- a/javascript/settings.js
+++ b/javascript/settings.js
@@ -2,7 +2,7 @@
 // Default settings
 // 
 
-var Version = "0.27.2";
+var Version = "0.27.3";
 
 //weather
 var city = "Almelo";
diff --git a/javascript/weather.js b/javascript/weather.js
index d0c9c2c..45dc104 100644
--- a/javascript/weather.js
+++ b/javascript/weather.js
@@ -31,14 +31,14 @@ function WeatherInfo() {
    xmlhttp=new XMLHttpRequest();
    xmlhttp.open('GET','http://api.openweathermap.org/data/2.5/forecast/daily?q=' + city + '&type=accurate&mode=xml&units=metric&cnt=7',false);
    xmlhttp.send();
-   xmlDoc=xmlhttp.responseXML; 
   try {
+   xmlDoc=xmlhttp.responseXML; 
    var x=xmlDoc.getElementsByTagName("time");
 
    htmltext += "<table class='center weather" + cssres[css_nr][Set_Res] + "'><tr>";
 
-var date = new Date();
-var y = date.getDay();
+   var date = new Date();
+   var y = date.getDay();
    for (var i=0;i<x.length;i++) {
 	htmltext += "<th>" + days[y] + "</th>";
 	y++;if (y > 6) {y = 0} ;
-- 
cgit v1.2.3