diff options
| author | M. Voerman <rekordc@gmail.com> | 2014-07-13 21:37:45 +0200 |
|---|---|---|
| committer | M. Voerman <rekordc@gmail.com> | 2014-07-13 21:37:45 +0200 |
| commit | 7a3ff1c6d4ee9a1c73f3679405ee7ebbf3559d04 (patch) | |
| tree | d4e127eee861f8e8f8bf314a2257420a5dedae3c | |
| parent | c8e485d49be4407c6124c1a286292941958febf2 (diff) | |
| download | vdr-vipclient-7a3ff1c6d4ee9a1c73f3679405ee7ebbf3559d04.tar.gz vdr-vipclient-7a3ff1c6d4ee9a1c73f3679405ee7ebbf3559d04.tar.bz2 | |
Fixed show timers info when using restfulapi
| -rw-r--r-- | index.html | 25 | ||||
| -rw-r--r-- | settings.js | 2 |
2 files changed, 11 insertions, 16 deletions
@@ -2886,7 +2886,7 @@ if(menu == 9) { // INFO2 Menu if (experimental) { htmltext += "\n \uE017 "; } else { htmltext += "\n \uE016 "; } htmltext += "Experimental"; if (Number(is.getObject("vip.testing2"))) { htmltext += "\n \uE017 "; } else { htmltext += "\n \uE016 "; } - htmltext += "Experimental 2"; + htmltext += "Experimental 2 (Info box 'not in package')"; if (smartTVplugin) { htmltext += "\n\n \uE017 "; } else { htmltext += "\n \uE016 "; } htmltext += "Has smartTVplugin" htmltext += "\n gettimers from"; @@ -3001,6 +3001,7 @@ try { timersDay[i] = x[i].getElementsByTagName("day")[0].childNodes[0].nodeValue; timersDays[i] = new Date(timersDay[i]*1000); timersDays[i] = timersDays[i].getDate() + "\uE003" + Left(months[timersDays[i].getMonth()],4); + timersFile[i] = x[i].getElementsByTagName("file")[0].childNodes[0].nodeValue + fill + fill; if (timersFlag[i] == "1") { timers[i] = "\uE003\uE00C\uE003"; @@ -3011,7 +3012,6 @@ try { } else { timers[i] = "\uE003?\uE003"; } - timersFile[i] = x[i].getElementsByTagName("file")[0].childNodes[0].nodeValue + fill + fill; timers[i] += timersDays[i] + "\uE003" + timersStrt[i] + "\uE003" + timersStop[i] + "\uE003" + Left(timersName[i],8) + "\uE003" + Left(timersFile[i],15) + "\n" ; timerOK = 1; @@ -3025,34 +3025,29 @@ try { maxTimers = x.length; for (var i=0;i<x.length;i++) { - var fill = "\uE003\uE003\uE003\uE003\uE003\uE003\uE003\uE003\uE003\uE003"; + var fill = "\uE003\uE003\uE003\uE003\uE003\uE003\uE003\uE003\uE003\uE003"; timersID[i] = x[i].getElementsByTagName("param")[0].childNodes[0].nodeValue; - alert("ID : " + timersID[i]); + timersChan[i] = x[i].getElementsByTagName("param")[11].childNodes[0].nodeValue; timersFlag[i] = x[i].getElementsByTagName("param")[1].childNodes[0].nodeValue; - alert("FLag : " + timersFlag[i]); timersStrt[i] = Right("00" + x[i].getElementsByTagName("param")[2].childNodes[0].nodeValue,4); timersStop[i] = Right("00" + x[i].getElementsByTagName("param")[3].childNodes[0].nodeValue,4); - alert("Start : " + timersStrt[i]); - alert("Stop : " + timersStop[i]); + timersEvnt[i] = x[i].getElementsByTagName("param")[8].childNodes[0].nodeValue; timersDays[i] = x[i].getElementsByTagName("param")[9].childNodes[0].nodeValue; if (timersDays[i] == "-------" ) { timersDays[i] = x[i].getElementsByTagName("param")[10].childNodes[0].nodeValue; } else { timersDays[i] += "\uE003\uE003\uE003"; } - alert ("Day : "+timersDays[i]); timersName[i] = x[i].getElementsByTagName("param")[15].childNodes[0].nodeValue + fill; - alert ("Name :" + timersName[i]); + timersFile[i] = x[i].getElementsByTagName("param")[14].childNodes[0].nodeValue + fill + fill; if (timersFlag[i] == "1") { - timer[i] = "\uE003\uE00C\uE003"; + timers[i] = "\uE003\uE00C\uE003"; } else if (timersFlag[i] == "9") { - timer[i] = "\uE003\uE00B\uE003"; + timers[i] = "\uE003\uE00B\uE003"; } else { - timer[i] = "\uE003\uE003\uE003"; + timers[i] = "\uE003\uE003\uE003"; } - timersFile[i] = x[i].getElementsByTagName("param")[14].childNodes[0].nodeValue + fill + fill; - alert("File : " + timersFile[i]); - timer[i] += timersDays[i] + "\uE003" + timersStrt[i] + "\uE003" + timersStop[i] + "\uE003" + Left(timersName[i],8) + "\uE003" + Left(timersFile[i],15) + "\n" ; + timers[i] += timersDays[i] + "\uE003" + timersStrt[i] + "\uE003" + timersStop[i] + "\uE003" + Left(timersName[i],8) + "\uE003" + Left(timersFile[i],15) + "\n" ; timerOK = 1; } diff --git a/settings.js b/settings.js index 6954f9b..ae445f1 100644 --- a/settings.js +++ b/settings.js @@ -2,7 +2,7 @@ // Default settings // -var Version = "0.25.3"; +var Version = "0.25.5"; server_ip_array = new Array("http://192.168.1.15","http://192.168.3.15","http://easyvdr","http://192.168.3.100","http://192.168.178.19","http://192.168.1.21","http://192.168.2.100","http://192.168.178.52"); |