Signed-off-by: Roman <ixrock@gmail.com>
This commit is contained in:
Roman committed 2021-11-03 13:01:17 +02:00
1 parent bc7a0b60be
commit 0ab850934d
2 files changed
+3 -3

No files matched your search

+1 -1
View File
@@ -66,7 +66,7 @@ export function getWinRootCA(): Promise<string[]> {
}, },
onend: () => { onend: () => {
resolve(CAs.filter(isCertActive)); resolve(CAs.filter(isCertActive));
} },
}); });
}); });
} }
@@ -54,7 +54,7 @@ export const defaultEditorProps: Partial<MonacoEditorProps> = {
get theme(): MonacoTheme { get theme(): MonacoTheme {
// theme for monaco-editor defined in `src/renderer/themes/lens-*.json` // theme for monaco-editor defined in `src/renderer/themes/lens-*.json`
return ThemeStore.getInstance().activeTheme.monacoTheme; return ThemeStore.getInstance().activeTheme.monacoTheme;
} },
}; };
@observer @observer
@@ -104,7 +104,7 @@ export class MonacoEditor extends React.Component<MonacoEditorProps> {
@computed get options(): editor.IStandaloneEditorConstructionOptions { @computed get options(): editor.IStandaloneEditorConstructionOptions {
return merge({}, return merge({},
UserStore.getInstance().editorConfiguration, UserStore.getInstance().editorConfiguration,
this.props.options this.props.options,
); );
} }