From 4163b6c59fde568a3ebcf70b9248a6516fb27bf8 Mon Sep 17 00:00:00 2001 From: Kushagra Gour Date: Mon, 25 Jun 2018 12:08:26 +0530 Subject: [PATCH] propagate prefs to codemirrors. fixes #307 --- src/components/ContentWrap.jsx | 6 +++++- src/components/UserCodeMirror.jsx | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/components/ContentWrap.jsx b/src/components/ContentWrap.jsx index 1f3d5ab..d5a7327 100644 --- a/src/components/ContentWrap.jsx +++ b/src/components/ContentWrap.jsx @@ -46,7 +46,8 @@ export default class ContentWrap extends Component { this.state.codeSplitSizes !== nextState.codeSplitSizes || this.state.mainSplitSizes !== nextState.mainSplitSizes || this.props.currentLayoutMode !== nextProps.currentLayoutMode || - this.props.currentItem !== nextProps.currentItem + this.props.currentItem !== nextProps.currentItem || + this.props.prefs !== nextProps.prefs ); } componentDidUpdate() { @@ -748,6 +749,7 @@ export default class ContentWrap extends Component { matchTags: { bothTags: true }, emmet: true }} + prefs={this.props.prefs} onChange={this.onHtmlCodeChange.bind(this)} onCreation={el => (this.cm.html = el)} onFocus={this.editorFocusHandler.bind(this)} @@ -813,6 +815,7 @@ export default class ContentWrap extends Component { ], emmet: true }} + prefs={this.props.prefs} onChange={this.onCssCodeChange.bind(this)} onCreation={el => (this.cm.css = el)} onFocus={this.editorFocusHandler.bind(this)} @@ -864,6 +867,7 @@ export default class ContentWrap extends Component { 'CodeMirror-foldgutter' ] }} + prefs={this.props.prefs} autoComplete={this.props.prefs.autoComplete} onChange={this.onJsCodeChange.bind(this)} onCreation={el => (this.cm.js = el)} diff --git a/src/components/UserCodeMirror.jsx b/src/components/UserCodeMirror.jsx index 4de1161..c11d6ee 100644 --- a/src/components/UserCodeMirror.jsx +++ b/src/components/UserCodeMirror.jsx @@ -114,7 +114,7 @@ export default class UserCodeMirror extends Component { if (!options.noAutocomplete) { this.cm.on('inputRead', (editor, input) => { if ( - !this.props.autoComplete || + !this.props.prefs.autoComplete || input.origin !== '+input' || input.text[0] === ';' || input.text[0] === ',' ||