frodovdr/hyperion.ng
1
0
Fork 0
mirror of https://github.com/hyperion-project/hyperion.ng.git synced 2025-03-01 10:33:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

priorities rework, webc update (#366)

Browse Source 
* update

* update

* tabs test

* update

* test

* ...

* fix editor

* update ui

* fix visual glitch if help is off

* fix fadecandy error and th

[skip ci]
This commit is contained in:
brindosch
2017-01-17 21:53:35 +01:00
committed by redPanther
parent 5b809743f7
commit 8d7137136b
75 changed files with 1713 additions and 1144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
assets/webconfig/js/hyperion.js
View File

@@ -1,5 +1,6 @@
// global vars
var webPrio = 1;
var showOptHelp = true;
var currentVersion;
var cleanCurrentVersion;
@@ -26,8 +27,7 @@ function initRestart()
$(hyperion).off();
requestServerConfigReload();
watchdog = 10;
$("#wrapper").fadeOut("slow");
connectionLostDetection();
connectionLostDetection('restart');
}
function cron()
@@ -37,15 +37,23 @@ function cron()
}
function connectionLostDetection()
function connectionLostDetection(type)
{
if ( watchdog > 1 )
{
var interval_id = window.setInterval("", 9999); // Get a reference to the last
for (var i = 1; i < interval_id; i++)
window.clearInterval(i);
$("body").html($("#container_connection_lost").html());
connectionLostAction();
if(type == 'restart')
{
$("body").html($("#container_restart").html());
restartAction();
}
else
{
$("body").html($("#container_connection_lost").html());
connectionLostAction();
}
}
else
{
@@ -200,19 +208,22 @@ function requestLedImageStop()
sendToHyperion("ledcolors", "imagestream-stop");
}
function requestPriorityClear()
function requestPriorityClear(prio)
{
sendToHyperion("clear", "", '"priority":1');
if(typeof prio !== 'number')
prio = webPrio;
sendToHyperion("clear", "", '"priority":'+prio+'');
}
function requestPlayEffect(effectName)
{
sendToHyperion("effect", "", '"effect":{"name":"'+effectName+'"},"priority":1');
sendToHyperion("effect", "", '"effect":{"name":"'+effectName+'"},"priority":'+webPrio+'');
}
function requestSetColor(r,g,b)
{
sendToHyperion("color", "", '"color":['+r+','+g+','+b+'], "priority":1');
sendToHyperion("color", "", '"color":['+r+','+g+','+b+'], "priority":'+webPrio+'');
}
function requestSetComponentState(comp, state)
@@ -229,14 +240,18 @@ function requestSetSource(prio)
sendToHyperion("sourceselect", "", '"priority":'+prio);
}
function requestWriteConfig(config)
function requestWriteConfig(config, full)
{
var complete_config = parsedConfJSON;
jQuery.each(config, function(i, val) {
complete_config[i] = val;
});
if(full === true)
parsedConfJSON = config;
else
{
jQuery.each(config, function(i, val) {
parsedConfJSON[i] = val;
});
}
var config_str = escape(encode_utf8(JSON.stringify(complete_config)));
var config_str = escape(encode_utf8(JSON.stringify(parsedConfJSON)));
$.post( "/cgi/cfg_set", { cfg: config_str })
.done(function( data ) {
@@ -255,7 +270,7 @@ function requestWriteEffect(effectName,effectPy,effectArgs)
function requestTestEffect(effectName,effectPy,effectArgs)
{
sendToHyperion("effect", "", '"effect":{"name":"'+effectName+'", "args":'+effectArgs+'},"priority":1, "pythonScript":"'+effectPy+'"}');
sendToHyperion("effect", "", '"effect":{"name":"'+effectName+'", "args":'+effectArgs+'},"priority":'+webPrio+', "pythonScript":"'+effectPy+'"}');
}
function requestDeleteEffect(effectName)