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

29
assets/webconfig/js/lib/jsoneditor.js
View File

@@ -232,6 +232,7 @@ JSONEditor.prototype = {
var theme_class = JSONEditor.defaults.themes[this.options.theme || JSONEditor.defaults.theme];
if(!theme_class) throw "Unknown theme " + (this.options.theme || JSONEditor.defaults.theme);
this.access = this.options.access;
this.schema = this.options.schema;
this.theme = new theme_class();
this.template = this.options.template;
@@ -322,7 +323,8 @@ JSONEditor.prototype = {
this.validation_results = null;
this.theme = null;
this.iconlib = null;
this.template = null;
this.access = null;
this.template = null;
this.__data = null;
this.ready = false;
this.element.innerHTML = '';
@@ -1418,7 +1420,8 @@ JSONEditor.AbstractEditor = Class.extend({
this.theme = this.jsoneditor.theme;
this.template_engine = this.jsoneditor.template;
this.iconlib = this.jsoneditor.iconlib;
this.access = this.jsoneditor.access;
this.translate = this.jsoneditor.translate || JSONEditor.defaults.translate;
this.original_schema = options.schema;
@@ -1458,13 +1461,12 @@ JSONEditor.AbstractEditor = Class.extend({
this.register();
this.onWatchedFieldChange();
//hide input field, if it didn't match the current access level
var storedAccess = localStorage.getItem("accesslevel");
//hide input fields, if they didn't match the current access level
var storedAccess = this.access
if(this.schema.access){
if(this.schema.access == 'system')
this.container.style.display = "none";
if(this.schema.access == 'expert' && storedAccess != 'expert'){
else if(this.schema.access == 'expert' && storedAccess != 'expert'){
this.container.style.display = "none";
//this.disable();
}
@@ -1725,7 +1727,7 @@ JSONEditor.AbstractEditor = Class.extend({
}
},
setValue: function(value) {
this.value = value;
this.value = value;
},
getValue: function() {
return this.value;
@@ -2150,7 +2152,7 @@ JSONEditor.defaults.editors.string = JSONEditor.AbstractEditor.extend({
if(this.format) this.input.setAttribute('data-schemaformat',this.format);
if(this.defaultValue) this.input.setAttribute('data-schemaformat',this.format);
if(this.formname)this.label.setAttribute('for',this.formname);
if(this.formname && this.label)this.label.setAttribute('for',this.formname);
this.control = this.theme.getFormControl(this.label, this.input, this.description, this.append, this.placeholder);
this.container.appendChild(this.control);
@@ -2898,7 +2900,7 @@ JSONEditor.defaults.editors.object = JSONEditor.AbstractEditor.extend({
else this.showEditJSON();
},
insertPropertyControlUsingPropertyOrder: function (property, control, container) {
var propertyOrder;
var propertyOrder;
if (this.schema.properties[property])
propertyOrder = this.schema.properties[property].propertyOrder;
if (typeof propertyOrder !== "number") propertyOrder = 1000;
@@ -4842,7 +4844,7 @@ JSONEditor.defaults.editors["enum"] = JSONEditor.AbstractEditor.extend({
}
},
setValue: function(val) {
if(this.value !== val) {
if(this.value !== val) {
this.value = val;
this.refreshValue();
this.onChange();
@@ -4861,16 +4863,15 @@ JSONEditor.defaults.editors.select = JSONEditor.AbstractEditor.extend({
setValue: function(value,initial) {
value = this.typecast(value||'');
// Sanitize value before setting it
//Sanitize value before setting it
var sanitized = value;
if(this.enum_values.indexOf(sanitized) < 0) {
sanitized = this.enum_values[0];
}
if(this.value === sanitized) {
return;
return;
}
this.input.value = this.enum_options[this.enum_values.indexOf(sanitized)];
if(this.select2) this.select2.select2('val',this.input.value);
this.value = sanitized;
@@ -4909,7 +4910,7 @@ JSONEditor.defaults.editors.select = JSONEditor.AbstractEditor.extend({
}
},
getValue: function() {
return this.value;
return this.value;
},
preBuild: function() {
var self = this;