Merge pull request #818 from LessWrong2/fixMarkdownEditing

Fix markdownediting for comments created with rich-text-editor
ForumMagnum · Aug 21, 2018 · 8e15fe2 · 8e15fe2
2 parents 60a18cd + f87d6a7
commit 8e15fe2
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 3 deletions.
diff --git a/packages/lesswrong/components/editor/CommentEditor.jsx b/packages/lesswrong/components/editor/CommentEditor.jsx
@@ -18,8 +18,18 @@ class CommentEditor extends Component {
   }
 
   async componentWillMount() {
+    const { currentUser } = this.props
     const {default: Editor} = await import('../async/AsyncCommentEditor.jsx');
     this.setState({editor: Editor});
+    const removeUnusedFields = (data) => {
+      let { content, body, ...newData } = data
+      if (Users.useMarkdownCommentEditor(currentUser)) {
+        return {...newData, body}
+      } else {
+        return {...newData, content}
+      }
+    }
+    this.context.addToSubmitForm(removeUnusedFields);
   }
 
   render() {
@@ -40,4 +50,8 @@ class CommentEditor extends Component {
   }
 }
 
+CommentEditor.contextTypes = {
+  addToSubmitForm: PropTypes.func,
+};
+
 registerComponent('CommentEditor', CommentEditor, withCurrentUser, withStyles(styles));
diff --git a/packages/lesswrong/components/editor/EditorFormComponent.jsx b/packages/lesswrong/components/editor/EditorFormComponent.jsx
@@ -21,8 +21,19 @@ class EditorFormComponent extends Component {
   }
 
   async componentWillMount() {
+    const { currentUser } = this.props
     const {default: Editor} = await import('../async/AsyncEditorFormComponent.jsx');
     this.setState({editor: Editor});
+
+    const removeUnusedFields = (data) => {
+      let { content, body, ...newData } = data
+      if (Users.useMarkdownPostEditor(currentUser)) {
+        return {...newData, body}
+      } else {
+        return {...newData, content}
+      }
+    }
+    this.context.addToSubmitForm(removeUnusedFields);
   }
 
   render() {
@@ -44,4 +55,8 @@ class EditorFormComponent extends Component {
   }
 }
 
+EditorFormComponent.contextTypes = {
+  addToSubmitForm: PropTypes.func,
+};
+
 registerComponent('EditorFormComponent', EditorFormComponent, withCurrentUser, withStyles(styles));
diff --git a/packages/lesswrong/lib/collections/comments/custom_fields.js b/packages/lesswrong/lib/collections/comments/custom_fields.js
@@ -59,11 +59,12 @@ Comments.addField([
       order: 25,
       form: {
         hintText:"Plain Markdown Editor",
-        name:"body",
-        rows:4,
         multiLine:true,
         fullWidth:true,
-        underlineShow:false
+        disableUnderline:true,
+        enableMarkDownEditor: true,
+        minHeight: 400,
+        name: "body"
       },
     }
   },