From 37dce50eaac0c889c17c341c6ecd2f790e80b021 Mon Sep 17 00:00:00 2001
From: vanhofen <vanhofen@gmx.de>
Date: Sat, 18 Feb 2023 12:00:13 +0100
Subject: [PATCH] yWeb/Y_Boxcontrol_Menue: simplify and fix init() and
 get_data() handling

Origin commit data
------------------
Commit: https://github.com/neutrino-images/ni-neutrino/commit/d1bf1e09551e487cc41ea310865ff90eb10263d3
Author: vanhofen <vanhofen@gmx.de>
Date: 2023-02-18 (Sat, 18 Feb 2023)

Origin message was:
------------------
- yWeb/Y_Boxcontrol_Menue: simplify and fix init() and get_data() handling
---
 data/y-web/Y_Boxcontrol_Menue.yhtm | 27 ++++++++++++++++-----------
 data/y-web/Y_Version.txt           |  2 +-
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/data/y-web/Y_Boxcontrol_Menue.yhtm b/data/y-web/Y_Boxcontrol_Menue.yhtm
index 1d7cceda0..fcc7e420d 100644
--- a/data/y-web/Y_Boxcontrol_Menue.yhtm
+++ b/data/y-web/Y_Boxcontrol_Menue.yhtm
@@ -4,6 +4,9 @@
 <script type="text/javascript" src="/Y_yweb.js"></script>
 <script type="text/javascript">
 //<![CDATA[
+function epg_plus_popup() {
+	window.open("Y_EPG_Plus.yhtm","_blank","resizable=yes,scrollbars=yes");
+}
 
 var g_sig = 100;
 function set_sigbar(_sig){
@@ -19,6 +22,7 @@ function set_sigbar(_sig){
 	else
 		r.width = (100-_sig).toString()+"%";
 }
+
 function sig_get(){
 	var __sig_str = loadSyncURL("/control/signal?sig");
 	var __sig = parseInt(__sig_str,10);
@@ -43,6 +47,7 @@ function set_snrbar(_snr){
 	else
 		r.width = (100-_snr).toString()+"%";
 }
+
 function snr_get(){
 	var __snr_str = loadSyncURL("/control/signal?snr");
 	var __snr = parseInt(__snr_str,10);
@@ -77,6 +82,7 @@ function volumen_set_audiobar(_volumen){
 	else
 		r.width = (100-_volumen).toString()+"%";
 }
+
 function volumen_get(){
 	var __volumen_str = loadSyncURL("/control/volume");
 	var __volumen = parseInt(__volumen_str,10);
@@ -85,6 +91,7 @@ function volumen_get(){
 	g_volumen = __volumen;
 	return __volumen;
 }
+
 function volumen_set(_volumen){
 	_volumen = Math.min(100, _volumen);
 	_volumen = Math.max(0, _volumen);
@@ -92,11 +99,13 @@ function volumen_set(_volumen){
 	volumen_set_audiobar(_volumen);
 	g_volumen = _volumen;
 }
+
 function set_mute_button(){
 	var status = loadSyncURL("/control/volume?status");
 	$('btMute').update( (status==1) ? "<img src=\"/images/volumeunmute.png\">" : "<img src=\"/images/volumemute.png\">");
 	return status;
 }
+
 function toggle_mute(){
 	var status = loadSyncURL("/control/volume?status");
 	if(status==0)//aus
@@ -105,29 +114,25 @@ function toggle_mute(){
 		loadSyncURL("/control/volume?unmute");
 	set_mute_button();
 }
+
 function set_mode(_mode){
 	var actual_mode = loadSyncURL("/control/getmode");
 	if(actual_mode != _mode)
 		loadSyncURL("/control/setmode?" + _mode);
 	parent.work.location.reload();
 }
-function init(){
-	volumen_set_audiobar(volumen_get());
-	set_mute_button();
-	set_sigbar(sig_get());
-	set_snrbar(snr_get());
-	ber_get();
-//	add_yExtensions('boxcontrol', 'secmenu_boxcontrol');
-}
+
 function get_data(){
 	volumen_set_audiobar(volumen_get());
 	set_sigbar(sig_get());
 	set_snrbar(snr_get());
 	ber_get();
-	add_yExtensions('boxcontrol', 'secmenu_boxcontrol');
 }
-function epg_plus_popup() {
-	window.open("Y_EPG_Plus.yhtm","_blank","resizable=yes,scrollbars=yes");
+
+function init(){
+	get_data();
+	set_mute_button();
+	add_yExtensions('boxcontrol', 'secmenu_boxcontrol');
 }
 //]]>
 </script>
diff --git a/data/y-web/Y_Version.txt b/data/y-web/Y_Version.txt
index 9a6fa5660..f2509dea6 100644
--- a/data/y-web/Y_Version.txt
+++ b/data/y-web/Y_Version.txt
@@ -1,3 +1,3 @@
-version=3.0.22
+version=3.0.23
 date=17.02.2023
 info=NI-Neutrino-Webinterface