bugfix for epg

3 files changed, 21 insertions, 9 deletions

diff --git a/History b/History
index 979457d..748e3e6 100644
--- a/History
+++ b/History
@@ -8,6 +8,7 @@ VDR 1.7.29+
 	Updated epgfilter for CDS on 19.2E
 	Updated remote keys in settings file.
 	Added parameter to script, if set script uses 'svdrpsend.pl', if not 'svdrpsend'
+	Fixed show ext epg info if ext info != short info.
 	
 
 0.25	Get recordings from Streamdev, Restfulapi or SmartTVweb.
diff --git a/index.html b/index.html
index ca0e2cf..ce94f72 100644
--- a/index.html
+++ b/index.html
@@ -699,6 +699,9 @@ function FullScreen() {
 
 
 function onKeyDown(event) {
+//show key info, needed when a 'new' remote is used
+//alert( "keyIdentifier  : " + event.keyIdentifier +"\n"+"ctrlKey    : " + event.ctrlKey +"\n"+"altKey     : " + event.altKey  +"\n"+"shiftKey  : " + event.shiftKey +"\n"+"RAW  : " + event );
+
     if(isVisible) {
  	onKeyTeletext(event.keyIdentifier);
     } else if(isSetupMenu) {
@@ -1688,13 +1691,16 @@ function GetEPG(epgchan)
 	    EPGShortnow = extEventsnow.shortInfo;
 	    EPGExtnow = extEventsnow.extendedInfo;
 	    Extok = 1;
+
 	} else { Extok = 0; }
 
+
+
 	EPG[0][1][epgchan] = event.name;
 	EPG[0][2][epgchan] = event.time;
 	EPG[0][3][epgchan] = (event.duration/60);
-	EPG[0][4][epgchan] = "";
-	EPG[0][5][epgchan] = "";
+//	EPG[0][4][epgchan] = "";
+//	EPG[0][5][epgchan] = "";
 	EPG[0][6][epgchan] = event.eventId;
 	if (event.parentalRating) {
 		EPG[0][8][epgchan] = "<br>(" + Lang[5] + (event.parentalRating + 3) + " )";
@@ -1722,7 +1728,9 @@ function GetEPG(epgchan)
 	EPG[0][5][epgchan] = "";
 	}
 
-	if (EPG[0][5][epgchan] = EPG[0][4][epgchan]) { EPG[0][5][epgchan] = "";}
+	if (EPG[0][5][epgchan] == EPG[0][4][epgchan]) { EPG[0][5][epgchan] = "";}
+
+
 
 	updateOSDtime(epgchan);
 
@@ -1740,8 +1748,8 @@ function GetEPG(epgchan)
 	EPG[1][1][epgchan] = event.name;
 	EPG[1][2][epgchan] = event.time;
 	EPG[1][3][epgchan] = (event.duration/60);
-	EPG[1][4][epgchan] = "";
-	EPG[1][5][epgchan] = "";
+//	EPG[1][4][epgchan] = "";
+//	EPG[1][5][epgchan] = "";
 	EPG[1][6][epgchan] = event.eventId;
 	if (event.parentalRating) {
 		EPG[1][8][epgchan] = "<br>(" + Lang[5] + (event.parentalRating + 3) + " )";
@@ -1768,7 +1776,7 @@ function GetEPG(epgchan)
 	EPG[1][5][epgchan] = "";
 	}
 	
-	if (EPG[1][5][epgchan] = EPG[1][4][epgchan]) { EPG[1][5][epgchan] = "";}
+	if (EPG[1][5][epgchan] == EPG[1][4][epgchan]) { EPG[1][5][epgchan] = "";}
 
 	tijd = event.time;
 	date = new Date(tijd*1000); 
diff --git a/settings.js b/settings.js
index feddb8f..b0841ff 100644
--- a/settings.js
+++ b/settings.js
@@ -127,11 +127,14 @@ var Yfactor = new Array();
 
 // keep scale compliant with Videooutputmodes!!
 //  720x576
-Xfactor[0] = 720 / 720; Yfactor[0] = 576 / 576;
+Xfactor[0] = 720 / 720;
+Yfactor[0] = 576 / 576;
 // 1280x720
-Xfactor[1] = 1280 / 720; Yfactor[1] = 720 / 576;
+Xfactor[1] = 1280 / 720; 
+Yfactor[1] = 720 / 576;
 // 1920x1080
-Xfactor[2] = 1920 / 720; Yfactor[2] = 1080 / 576;
+Xfactor[2] = 1920 / 720;
+Yfactor[2] = 1080 / 576;
 
 
 var audio = 0;