From 1e917cf72f32f28d4dfd663aea05c4f79aa82eae Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Wed, 20 Sep 2017 09:34:01 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E8=AE=ADTPM=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E9=A2=98=E5=90=8E=E4=BF=9D=E5=AD=98=EF=BC=8C?=
 =?UTF-8?q?=E9=A2=98=E5=B9=B2=E5=92=8C=E5=8F=82=E8=80=83=E7=AD=94=E6=A1=88?=
 =?UTF-8?q?=E5=87=BA=E7=8E=B0=E6=A0=B7=E5=BC=8F=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/challenges/_choose_type.html.erb    | 18 ++++-----
 ..._single_or_multiple_question_show.html.erb | 37 ++++++++++---------
 app/views/challenges/choose_type_show.js.erb  |  3 +-
 3 files changed, 31 insertions(+), 27 deletions(-)

diff --git a/app/views/challenges/_choose_type.html.erb b/app/views/challenges/_choose_type.html.erb
index 320e5ba9f..b1e6f8b02 100644
--- a/app/views/challenges/_choose_type.html.erb
+++ b/app/views/challenges/_choose_type.html.erb
@@ -41,15 +41,15 @@
   <%#= render :partial => 'single_or_multiple_question_show'%>
 </div>
 <script>
-    editormd.loadKaTeX(function() {
-        var taskPassMD = editormd.markdownToHTML("challenge_task_pass_show", {
-            htmlDecode: "style,script,iframe",  // you can filter tags decode
-            taskList: true,
-            tex: true,  // 默认不解析
-            flowChart: true,  // 默认不解析
-            sequenceDiagram: true // 默认不解析
-        });
-    });
+  editormd.loadKaTeX(function() {
+      var taskPassMD = editormd.markdownToHTML("challenge_task_pass_show", {
+          htmlDecode: "style,script,iframe",  // you can filter tags decode
+          taskList: true,
+          tex: true,  // 默认不解析
+          flowChart: true,  // 默认不解析
+          sequenceDiagram: true // 默认不解析
+      });
+  });
     //添加单选、多选tab
     $(".addoption-btn").on("click",function(){
         var length= $(".stage-part-2").find(".nav_check_item li").length;
diff --git a/app/views/challenges/_single_or_multiple_question_show.html.erb b/app/views/challenges/_single_or_multiple_question_show.html.erb
index b4a528a8d..04861b126 100644
--- a/app/views/challenges/_single_or_multiple_question_show.html.erb
+++ b/app/views/challenges/_single_or_multiple_question_show.html.erb
@@ -1,3 +1,5 @@
+<%= javascript_include_tag '/editormd/lib/marked.min.js','/editormd/lib/prettify.min.js','/editormd/lib/raphael.min.js','/editormd/lib/underscore.min.js','/editormd/lib/sequence-diagram.min.js',
+                           '/editormd/lib/flowchart.min.js','/editormd/lib/jquery.flowchart.min.js','/editormd/editormd.js' %>
 <div class="white_bg">
     <div class="panel-form">
       <li class="clearfix pr30">
@@ -7,7 +9,7 @@
       <li class="clearfix">
         <label class="panel-form-label fl">题干：&nbsp;&nbsp;</label>
         <div class="fl panel-box-sizing panel-form-width-690 new_li white_bg bor-grey-e" id="challenge_choose_subject_show" style="width: 90%;">
-          <textarea name="choose[subject]"><%= @challenge_choose.subject %></textarea>
+          <textarea name="choose[subject]" style="display: none"><%= @challenge_choose.subject %></textarea>
         </div>
       </li>
       <% @challenge_choose.challenge_questions.each_with_index do |option, index| %>
@@ -24,7 +26,7 @@
       <li class="clearfix">
         <label class="panel-form-label fl">参考答案：&nbsp;&nbsp;</label>
         <div class="fl panel-box-sizing panel-form-width-690 new_li white_bg bor-grey-e" id="choose_task_pass_show" style="width: 90%;">
-          <textarea name="choose[subject]"><%= @challenge_choose.answer %></textarea>
+          <textarea name="choose[subject]" style="display: none;"><%= @challenge_choose.answer %></textarea>
         </div>
       </li>
     </div>
@@ -63,22 +65,23 @@
 </div>
 
 <script>
-  /*  $(document).ready(function() {
-        editormd.loadKaTeX(function() {
-            var subjectMD = editormd.markdownToHTML("challenge_choose_subject_show", {
-                htmlDecode: "style,script,iframe",  // you can filter tags decode
-                taskList: true,
-                tex: true,  // 默认不解析
-                flowChart: true,  // 默认不解析
-                sequenceDiagram: true // 默认不解析
+    $(function(){
+        var subjectMD, taskPassMD;
+        $.get("", function(markdown){
+            subjectMD = editormd.markdownToHTML("challenge_choose_subject_show", {
+                htmlDecode      : "style,script,iframe",  // you can filter tags decode
+                taskList        : true,
+                tex             : true,  // 默认不解析
+                flowChart       : true,  // 默认不解析
+                sequenceDiagram : true  // 默认不解析
             });
-            var taskPassMD = editormd.markdownToHTML("choose_task_pass_show", {
-                htmlDecode: "style,script,iframe",  // you can filter tags decode
-                taskList: true,
-                tex: true,  // 默认不解析
-                flowChart: true,  // 默认不解析
-                sequenceDiagram: true // 默认不解析
+            taskPassMD = editormd.markdownToHTML("choose_task_pass_show", {
+                htmlDecode      : "style,script,iframe",  // you can filter tags decode
+                taskList        : true,
+                tex             : true,  // 默认不解析
+                flowChart       : true,  // 默认不解析
+                sequenceDiagram : true  // 默认不解析
             });
         });
-    });*/
+    });
 </script>
\ No newline at end of file
diff --git a/app/views/challenges/choose_type_show.js.erb b/app/views/challenges/choose_type_show.js.erb
index 2934cbc53..402097644 100644
--- a/app/views/challenges/choose_type_show.js.erb
+++ b/app/views/challenges/choose_type_show.js.erb
@@ -1,6 +1,7 @@
 $("#task_content").html("<%= j(render :partial => 'single_or_multiple_question_show')%>");
 $("#challenge_choose_tab").html("<%= j(render :partial => "challenges/choose_tab") %>");
 
+/*
 // JS局部刷新时，有可能加载不成功，需要重新加载一次（具体原因不明）
 editormd.loadKaTeX(function() {
     editormd.markdownToHTML("challenge_choose_subject_show", {
@@ -17,4 +18,4 @@ editormd.loadKaTeX(function() {
         flowChart: true,  // 默认不解析
         sequenceDiagram: true // 默认不解析
     })
-});
\ No newline at end of file
+});*/