From a1a173950845ffc2628f6b9343aecb01334b42ed Mon Sep 17 00:00:00 2001
From: Roman Hotsiy <gotsijroman@gmail.com>
Date: Tue, 10 May 2016 09:44:26 +0300
Subject: [PATCH] Fixed resolving additional properties inside of array

---
 lib/components/JsonSchema/json-schema.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/components/JsonSchema/json-schema.js b/lib/components/JsonSchema/json-schema.js
index 26b8277f..a4deef6c 100644
--- a/lib/components/JsonSchema/json-schema.js
+++ b/lib/components/JsonSchema/json-schema.js
@@ -109,7 +109,7 @@ export class JsonSchema extends BaseComponent {
     props = props || [];
 
     if (schema.additionalProperties && schema.additionalProperties !== false) {
-      let propsSchema = this.prepareAdditionalProperties(schema.additionalProperties);
+      let propsSchema = this.prepareAdditionalProperties(schema);
       propsSchema._additional = true;
       props.push(propsSchema);
     }
@@ -126,8 +126,9 @@ export class JsonSchema extends BaseComponent {
   }
 
   prepareAdditionalProperties(schema) {
-    return JsonSchema.injectPropertyData(schema, '<Additional Properties> *',
-      JsonPointer.join(schema._pointer || this.pointer, ['additionalProperties']));
+    var addProps = schema.additionalProperties;
+    return JsonSchema.injectPropertyData(addProps, '<Additional Properties> *',
+      JsonPointer.join(addProps._pointer || schema._pointer || this.pointer, ['additionalProperties']));
   }
 
   static injectPropertyData(propertySchema, propertyName, propPointer) {