From 8d82ecc89c725587aefdbed22453ef484bcbc5dc Mon Sep 17 00:00:00 2001
From: yutao <283765470@qq.com>
Date: Tue, 26 May 2015 15:01:11 +0800
Subject: [PATCH] ...

---
 app/views/boards/_form_project.html.erb |  1 +
 app/views/boards/_project_show.html.erb | 16 +++++++++++-----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/app/views/boards/_form_project.html.erb b/app/views/boards/_form_project.html.erb
index ca23193b4..13bc7bc87 100644
--- a/app/views/boards/_form_project.html.erb
+++ b/app/views/boards/_form_project.html.erb
@@ -66,6 +66,7 @@
                                         :maxlength => 5000 %>
 
   <% else %>
+      <input nhname="init_content_val" value="<%=topic.content%>" type="hidden"/>
       <%= f.text_area :content,
                        :width => '90%',
                        :height => 300,
diff --git a/app/views/boards/_project_show.html.erb b/app/views/boards/_project_show.html.erb
index b0fd4049f..633602de8 100644
--- a/app/views/boards/_project_show.html.erb
+++ b/app/views/boards/_project_show.html.erb
@@ -180,8 +180,8 @@
           if($.trim(params.content.html()) == ""){
               result=false;
           }
-          if(params.content.html()!=params.textarea.html()){
-              params.content.sync();
+          if(params.content.html()!=params.textarea.html() || params.issubmit==true){
+              params.textarea.html(params.content.html());
               if($.trim(params.content.html()) == ""){
                   params.contentmsg.html('内容不能为空');
                   params.contentmsg.css({color:'#ff0000'});
@@ -218,6 +218,7 @@
               //表单提交
               params.form.submit(function(){
                   var is_checked = nh_check_field({
+                      issubmit:true,
                       subject:params.inputsubject,
                       subjectmsg:params.subjectmsg,
                       content:editor,
@@ -225,7 +226,7 @@
                       textarea:params.textarea
                   });
                   if(is_checked){
-                      alert('submit');
+//                      alert('submit');
 //                      return false;
                       return true;
                   }
@@ -240,7 +241,11 @@
                   params.about_talk.toggle();//显示/隐藏编辑区
                   if(params.about_talk.is(':hidden')){//隐藏时reset表单数据
                       params.form[0].reset();
-                      params.textarea.empty();
+                      if(params.type=='reply'){
+                          params.textarea.empty();
+                      }else{
+                          params.textarea.html(params.init_content_val.val());
+                      }
                       editor.html(params.textarea.html());
                       params.subjectmsg.hide();
                       params.contentmsg.hide();
@@ -305,7 +310,8 @@
                   contentmsg:$("p[nhname='contentmsg']",about_talk),
                   submitbtn:$("a[nhname='submitbtn']",about_talk),
                   cancelbtn:$("a[nhname='cancelbtn']",about_talk),
-                  form:$("form[nhname='form']",about_talk)
+                  form:$("form[nhname='form']",about_talk),
+                  init_content_val:$("input[nhname='init_content_val']",about_talk)
               });
           });
           $("div[mhname='container_board_reply']").each(function(){