Minor fixes before alpha

This commit is contained in:
Roman Hotsiy 2017-11-23 11:28:05 +02:00
parent 52e7bfb347
commit 0faa66b6e6
No known key found for this signature in database
GPG Key ID: 5CB7B3ACABA57CB0
3 changed files with 4 additions and 2 deletions

View File

@ -1,4 +1,5 @@
import * as React from 'react';
import * as PropTypes from 'prop-types';
import { Loading } from './Loading/Loading';
import { StoreProvider } from './StoreProvider';
@ -31,6 +32,7 @@ export class RedocStandalone extends React.Component<RedocStandaloneProps> {
}
return null;
},
options: PropTypes.object,
};
render() {

View File

@ -55,7 +55,7 @@ export class OAuthFlow extends React.PureComponent<OAuthFlowProps> {
</div>
<ul>
{Object.keys(flow!.scopes).map(scope => (
<li>
<li key={scope}>
<code>{scope}</code> - {flow!.scopes[scope]}
</li>
))}

View File

@ -33,7 +33,7 @@ export class RedocNormalizedOptions {
untrustedSpec: boolean;
constructor(raw: RedocRawOptions) {
this.theme = mergeObjects({} as any, raw.theme || {}, defaultTheme);
this.theme = mergeObjects({} as any, defaultTheme, raw.theme || {});
this.scrollYOffset = RedocNormalizedOptions.normalizeScrollYOffset(raw.scrollYOffset);
this.hideHostname = RedocNormalizedOptions.normalizeHideHostname(raw.hideHostname);
this.expandResponses = RedocNormalizedOptions.normalizeExpandResponses(raw.expandResponses);