Merge branch 'mediafoundation' of https://github.com/Paulchen-Panther/hyperion.ng into mediafoundation

This commit is contained in:
Paulchen Panther
2021-01-24 12:16:42 +01:00
2 changed files with 12 additions and 15 deletions

View File

@@ -84,20 +84,18 @@ $(document).ready(function () {
}
}
if (key != 'device_inputs' || enumVals.length > 0) {
window.schema.grabberV4L2.properties[key] = {
"type": schema[key].type,
"title": schema[key].title,
...(schema[key].custom ? {"enum": [].concat(["auto"], enumVals, ["custom"]),} : {"enum": [].concat(["auto"], enumVals),}),
// "enum": [].concat(["auto"], enumVals, ["custom"]),
"options":
{
"enum_titles": [].concat(["edt_conf_enum_automatic"], enumTitelVals, ["edt_conf_enum_custom"]),
},
"propertyOrder": schema[key].propertyOrder,
"required": schema[key].required
};
}
window.schema.grabberV4L2.properties[key] = {
"type": schema[key].type,
"title": schema[key].title,
...(schema[key].custom ? {"enum": [].concat(["auto"], enumVals, ["custom"]),} : {"enum": [].concat(["auto"], enumVals),}),
// "enum": [].concat(["auto"], enumVals, ["custom"]),
"options":
{
"enum_titles": [].concat(["edt_conf_enum_automatic"], enumTitelVals, ["edt_conf_enum_custom"]),
},
"propertyOrder": schema[key].propertyOrder,
"required": schema[key].required
};
}
};