From e22d074bee531a05434c720e6a13bd93a343ed64 Mon Sep 17 00:00:00 2001 From: "M. Voerman" Date: Tue, 27 Oct 2015 00:05:55 +0100 Subject: removed media menu time out, will fix later --- javascript/main.js | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/javascript/main.js b/javascript/main.js index 7d35d2b..dad01dc 100644 --- a/javascript/main.js +++ b/javascript/main.js @@ -348,7 +348,8 @@ var numObjs = event.objectNames.length; } } else { - MenuOffID = setTimeout("UnloadMediaSettings();", MenuTimeOut); +// if(MenuOffID) { clearTimeout(MenuOffID);} +// MenuOffID = setTimeout("UnloadMediaSettings();", MenuTimeOut); showDisplay("STOP", false, 100, 0 ); showMediaList(); } @@ -757,8 +758,8 @@ function onKeyDown(event) { if(!MPDListener) { MenuOffID = setTimeout("MenuOff(0);", MenuTimeOut);} onKeyMenu(event.keyIdentifier); } else if(isMediaMenu) { - if(MenuOffID) { clearTimeout(MenuOffID);} - MenuOffID = setTimeout("UnloadMediaSettings();", MenuTimeOut); +// if(MenuOffID) { clearTimeout(MenuOffID);} +// MenuOffID = setTimeout("UnloadMediaSettings();", MenuTimeOut); onKeyMedia(event.keyIdentifier); } else { @@ -3621,7 +3622,8 @@ function playMPD(uri) { // Media Player Section function LoadMediaSettings() { - MenuOffID = setTimeout("UnloadMediaSettings();", MenuTimeOut); +// if(MenuOffID) { clearTimeout(MenuOffID);} +// MenuOffID = setTimeout("UnloadMediaSettings();", MenuTimeOut); subgroup = 0; subsubgroup = 0; isMediaMenu = 1; @@ -3634,7 +3636,7 @@ function LoadMediaSettings() { } function UnloadMediaSettings() { - if(MenuOffID) { clearTimeout(MenuOffID);} +// if(MenuOffID) { clearTimeout(MenuOffID);} mediaPlayer.removeEventListener(mediaPlayer.ON_POSITION_CHANGED, ShowMediaOSD); mediaPlayer.removeEventListener(mediaPlayer.ON_STATE_CHANGED, onStateChanged); medialist.style.opacity = 0; @@ -5407,10 +5409,11 @@ function MenuOff(menu_on) { function MediaMenuOff(menu_on) { if (menu_on) { - MenuOffID = setTimeout("UnloadMediaSettings();", MenuTimeOut); +// if(MenuOffID) { clearTimeout(MenuOffID);} +// MenuOffID = setTimeout("UnloadMediaSettings();", MenuTimeOut); medialist.style.opacity = 0.9; } else { - if(MenuOffID) { clearTimeout(MenuOffID);} +// if(MenuOffID) { clearTimeout(MenuOffID);} medialist.style.opacity = 0; } } -- cgit v1.2.3