required as property list

theyiwenliu · Aug 13, 2015 · 24ccab3 · 24ccab3
1 parent 54ba7d2
commit 24ccab3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/editor.js b/src/editor.js
@@ -368,6 +368,12 @@ JSONEditor.AbstractEditor = Class.extend({
   isEnabled: function() {
     return !this.disabled;
   },
+  isRequired: function() {
+    if(typeof this.schema.required === "boolean") return this.schema.required;
+    else if(this.parent && this.parent.schema && Array.isArray(this.parent.schema.required)) return this.parent.schema.required.indexOf(this.key) > -1;
+    else if(this.jsoneditor.options.required_by_default) return true;
+    else return false;
+  },  
   getDisplayText: function(arr) {
     var disp = [];
     var used = {};

diff --git a/src/editors/select.js b/src/editors/select.js
@@ -69,7 +69,7 @@ JSONEditor.defaults.editors.select = JSONEditor.AbstractEditor.extend({
         self.enum_values[i] = self.typecast(option);
       });
 
-      if(!this.schema.required){
+      if(!this.isRequired()){
         self.enum_display.unshift(' ');
         self.enum_options.unshift('undefined');
         self.enum_values.unshift(undefined);
@@ -82,7 +82,7 @@ JSONEditor.defaults.editors.select = JSONEditor.AbstractEditor.extend({
       self.enum_options = ['1',''];
       self.enum_values = [true,false];
 
-      if(!this.schema.required){
+      if(!this.isRequired()){
         self.enum_display.unshift(' ');
         self.enum_options.unshift('undefined');
         self.enum_values.unshift(undefined);