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

impl options explanation, uiLock (#343)

Browse Source 
* update schemas

* update

* killed upstream change

* min prio is now 100

* reset watchdog regularly

* update

* fix

* update
This commit is contained in:
brindosch
2016-12-21 18:24:03 +01:00
committed by GitHub
parent 0414e3c860
commit 88bed79c07
34 changed files with 879 additions and 399 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
assets/webconfig/js/content_effectsconfigurator.js
View File

@@ -30,7 +30,7 @@ JSONEditor.defaults.editors.colorPicker = JSONEditor.defaults.editors.string.ext
build: function() {
this._super();
var myinput = this;
$(myinput.input).parent().attr("class", $(myinput.input).parent().attr('class') + " colorpicker-element");
$(myinput.input).parent().attr("class", $(myinput.input).parent().attr('class') + " colorpicker-element input-group");
$(myinput.input).append("<span class='input-group-addon' id='event_catcher'><i></i></span>");
$(myinput.input).colorpicker({
format: 'rgb',
@@ -116,7 +116,7 @@ $(hyperion).one("cmd-config-getschema", function(event) {
if (effects[idx].schemaContent.script == this.value){
effects_editor = createJsonEditor('editor_container', {
args : effects[idx].schemaContent,
},false);
},false, true);
effectPy = ':';
effectPy += effects[idx].schemaContent.script;
}
@@ -130,7 +130,7 @@ $(hyperion).one("cmd-config-getschema", function(event) {
});
});
$("#name-input").on('change keydown click', function(event) {
$("#name-input").on('change keydown click focusout', function(event) {
effectName = $(this).val();
if ($(this).val() == '') {
effects_editor.disable();