From 38e9cff9fa65c2870a1f0fa91a065cf3975b5ddf Mon Sep 17 00:00:00 2001 From: Lovepreet Singh Date: Wed, 18 Apr 2018 20:49:31 +0530 Subject: [PATCH] fix(editor): Clear codemirror undo on new challenge (#17002) clear codemirror undo stack on new challenge Closes #16960 fix(editor): Removed not required code Closes #16960 feat(editor): Updated code with coding style Closes #16960 --- common/app/routes/Challenges/views/classic/Editor.jsx | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/common/app/routes/Challenges/views/classic/Editor.jsx b/common/app/routes/Challenges/views/classic/Editor.jsx index eae182be6f..7bddbbff14 100644 --- a/common/app/routes/Challenges/views/classic/Editor.jsx +++ b/common/app/routes/Challenges/views/classic/Editor.jsx @@ -16,7 +16,7 @@ import { keySelector } from '../../redux'; -import { themeSelector } from '../../../../redux'; +import { themeSelector, challengeSelector } from '../../../../redux'; import { filesSelector } from '../../../../files'; @@ -39,17 +39,20 @@ const options = { const mapStateToProps = createSelector( filesSelector, challengeMetaSelector, + challengeSelector, keySelector, themeSelector, ( files = {}, - { mode = 'javascript'}, + { mode = 'javascript' }, + { id }, key, theme ) => ({ content: files[key] && files[key].contents || '// Happy Coding!', file: files[key], fileKey: key, + id, mode, theme }) @@ -65,6 +68,7 @@ const propTypes = { content: PropTypes.string, executeChallenge: PropTypes.func.isRequired, fileKey: PropTypes.string.isRequired, + id: PropTypes.string, mode: PropTypes.string, theme: PropTypes.string }; @@ -125,6 +129,7 @@ export class Editor extends PureComponent { content, executeChallenge, fileKey, + id, classicEditorUpdated, mode } = this.props; @@ -136,6 +141,7 @@ export class Editor extends PureComponent { > }> classicEditorUpdated(fileKey, change) } options={ this.createOptions({ executeChallenge, mode, cmTheme }) } ref='editor'