Merge branch 'master' into fix-checkbox-labels

Author: JElchison

.gitignore

@@ -8,3 +8,4 @@
 .env
 /src/themes/*.css.js
 /src/editors/*.css.js
+/.vs

CHANGELOG.md

@@ -12,6 +12,7 @@
 - Cleaned how default themes, iconlibs, editors and templates are imported to JSONEditor
 - Added ability to attache editors and themes style rules to the shadowRoot if the editor is inside a Web Component.
 - Fix of #701 - editors/number.js and editors/integer.js don't change values when validation is failed
+- Fix of #716 - add ignore for allOf to fall in line with existing ignores of anyOf/oneOf for additionalProperties validation
 - Fix of #714 - Checkboxes inside object tables duplicate labels from heading
 
 ### 2.0.0-dev

src/validator.js

@@ -575,8 +575,8 @@ export class Validator {
         }
       })
 
-      /* The no_additional_properties option currently doesn't work with extended schemas that use oneOf or anyOf */
-      if (typeof schema.additionalProperties === 'undefined' && this.jsoneditor.options.no_additional_properties && !schema.oneOf && !schema.anyOf) {
+      /* The no_additional_properties option currently doesn't work with extended schemas that use oneOf or anyOf or allOf */
+      if (typeof schema.additionalProperties === 'undefined' && this.jsoneditor.options.no_additional_properties && !schema.oneOf && !schema.anyOf && !schema.allOf) {
         schema.additionalProperties = false
       }