Commit 125d6972 authored by Boris Kocherov's avatar Boris Kocherov

take in account schema may be boolean so i can not inline change schema

i can only assign value
parent 0fbb5f70
...@@ -385,11 +385,11 @@ ...@@ -385,11 +385,11 @@
case "additionalItems": case "additionalItems":
case "contains": case "contains":
case "propertyNames": case "propertyNames":
mergeSchemas(x[key], y[key], true); x[key] = mergeSchemas(x[key], y[key], true);
break; break;
case "items": case "items":
// XXX items can be array // XXX items can be array
mergeSchemas(x[key], y[key], true); x[key] = mergeSchemas(x[key], y[key], true);
break; break;
case "contentEncoding": case "contentEncoding":
case "contentMediaType": case "contentMediaType":
...@@ -427,7 +427,7 @@ ...@@ -427,7 +427,7 @@
for (p in y[key]) { for (p in y[key]) {
if (y[key].hasOwnProperty(p)) { if (y[key].hasOwnProperty(p)) {
if (x[key].hasOwnProperty(p)) { if (x[key].hasOwnProperty(p)) {
mergeSchemas(x[key][p], y[key][p], true); x[key][p] = mergeSchemas(x[key][p], y[key][p], true);
} else { } else {
x[key][p] = y[key][p]; x[key][p] = y[key][p];
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment