From b6166120326338cb53e5a92d57efbc39bcd186a3 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 27 Nov 2015 17:57:17 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E9=AA=8C=E5=8F=96=E6=B6=88=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E7=9A=84=E8=BF=98=E5=8E=9F=E5=8A=9F=E8=83=BD=E6=9A=82?=
 =?UTF-8?q?=E6=97=B6=E9=9A=90=E8=97=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/exercise/_edit_head.html.erb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/exercise/_edit_head.html.erb b/app/views/exercise/_edit_head.html.erb
index b69f52a56..64f34b5aa 100644
--- a/app/views/exercise/_edit_head.html.erb
+++ b/app/views/exercise/_edit_head.html.erb
@@ -20,7 +20,7 @@
         <a class="btn_submit c_white" data-button="ok" onclick="pollsSubmit($(this));">
           保存
         </a>
-        <a class="btn_cancel" data-button="cancel" onclick="resetHead();pollsCancel();">
+        <a class="btn_cancel" data-button="cancel" onclick="pollsCancel();">
           <%= l(:button_cancel)%>
         </a>
       </div>
@@ -35,6 +35,6 @@
         $("#exercise_time").val("<%=exercise.time if exercise.time!= -1 %>");
         $("#exercise_publish_time").val("<%= Time.parse(format_time(exercise.publish_time)).strftime("%Y-%m-%d") if !exercise.publish_time.nil?%>");
         /*$("#exercise_description").text("<%#=exercise.exercise_description.html_safe %>");*/
-        document.getElementById("exercise_description").innerText = <%=exercise.exercise_description.html_safe %>;
+        document.getElementById("exercise_description").innerHTML = <%=exercise.exercise_description.html_safe %>;
     }
 </script>
\ No newline at end of file