From f58d1e1b845147919b071504021f55ea78b5c755 Mon Sep 17 00:00:00 2001
From: hjm <63528605@qq.com>
Date: Mon, 5 Aug 2019 16:06:11 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=20is=5Fmd?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/react/src/modules/courses/boards/TopicDetail.js | 7 +++++--
 public/react/src/modules/forums/MemoDetail.js          | 9 +++++----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/public/react/src/modules/courses/boards/TopicDetail.js b/public/react/src/modules/courses/boards/TopicDetail.js
index 970cf798a..58bb0c662 100644
--- a/public/react/src/modules/courses/boards/TopicDetail.js
+++ b/public/react/src/modules/courses/boards/TopicDetail.js
@@ -648,9 +648,12 @@ class TopicDetail extends Component {
 
                     
                     <div className="padding30 memoContent new_li" style={{ paddingBottom: '10px'}}>
-                      {memo.is_md == true ? <MarkdownToHtml content={memo.content}></MarkdownToHtml> : 
+                      <MarkdownToHtml content={memo.content}></MarkdownToHtml> 
+                      {/* {memo.is_md == true ? 
+                        
+                        : 
                         <div dangerouslySetInnerHTML={{ __html: memo.content }}></div>
-                      }
+                      } */}
                     </div>
                     <div className="padding30 bor-bottom-greyE" style={{paddingTop: '2px'}}>
                         <div className="mt10 mb20">
diff --git a/public/react/src/modules/forums/MemoDetail.js b/public/react/src/modules/forums/MemoDetail.js
index 8441a8ac9..3e92d7391 100644
--- a/public/react/src/modules/forums/MemoDetail.js
+++ b/public/react/src/modules/forums/MemoDetail.js
@@ -145,7 +145,7 @@ class MemoDetail extends Component {
       //     && (!prevProps.memo || prevProps.memo.content != this.props.memo.content) ) {
       if (this.props.memo && this.props.memo.content && prevState.memoLoading === true && this.state.memoLoading === false) {
         // md渲染content，等xhr执行完（即memoLoading变化），memo.content更新后初始化md
-        if (this.props.memo.is_md) {
+        // if (this.props.memo.is_md) {
           setTimeout(()=>{
           var shixunDescr = window.editormd.markdownToHTML("memo_content_editorMd", {
               htmlDecode: "style,script,iframe",  // you can filter tags decode
@@ -155,7 +155,7 @@ class MemoDetail extends Component {
               sequenceDiagram: true // 默认不解析
           });
           }, 200)
-        }
+        // }
       }
     }
 
@@ -766,14 +766,15 @@ class MemoDetail extends Component {
 
                     
                     <div className="padding40 memoContent new_li">
-                      { !memo.is_md ?
+                      {/* { !memo.is_md ?
                           <div dangerouslySetInnerHTML={{__html: memo.content}}></div>  :
+                      } */}
                           <div id="memo_content_editorMd" className="new_li">
                             <textarea style={{'display': 'none'}}>
                               {memo.content}
                             </textarea>
                           </div>
-                      }
+                      
                     </div>
 
                     <div className="padding40 bor-bottom-greyE" style={{ paddingTop: '0px'}}>