Merge branch 'master' into releases

This commit is contained in:
RedocBot 2016-04-28 07:30:37 +00:00 committed by travis@localhost
commit 89619e1c2c
2 changed files with 4 additions and 4 deletions

View File

@ -105,14 +105,14 @@ export default class JsonSchema extends BaseComponent {
}
return propertySchema;
});
if (this.skipReadOnly) {
props = props.filter(prop => !prop.readOnly);
}
// Move discriminator field to the end of properties list
if (discriminatorFieldIdx > -1) {
let discrProp = props.splice(discriminatorFieldIdx, 1);
props.push(discrProp[0]);
}
if (this.skipReadOnly) {
props = props.filter(prop => !prop.readOnly);
}
schema.properties = props;
}

View File

@ -1,7 +1,7 @@
{
"name": "redoc",
"description": "Swagger-generated API Reference Documentation",
"version": "0.7.13",
"version": "0.7.14",
"repository": {
"type": "git",
"url": "git://github.com/Rebilly/ReDoc"