From ab64b38cee7fdc03f13aaf0082f3dfee9eda7af7 Mon Sep 17 00:00:00 2001
From: yutao <283765470@qq.com>
Date: Fri, 12 Jun 2015 17:26:40 +0800
Subject: [PATCH] =?UTF-8?q?=E7=95=99=E8=A8=80=E6=8F=90=E4=BA=A4=E4=B9=8B?=
 =?UTF-8?q?=E5=90=8E=E6=B8=85=E9=99=A4=E7=BC=96=E8=BE=91=E6=A1=86=E5=86=85?=
 =?UTF-8?q?=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_user_jours.html.erb | 4 ++++
 app/views/words/_new.html.erb        | 1 +
 app/views/words/create.js.erb        | 3 +++
 3 files changed, 8 insertions(+)

diff --git a/app/views/users/_user_jours.html.erb b/app/views/users/_user_jours.html.erb
index 3d7496fb2..ee8d14841 100644
--- a/app/views/users/_user_jours.html.erb
+++ b/app/views/users/_user_jours.html.erb
@@ -213,9 +213,13 @@
         params.textarea = $("textarea[nhname='new_message_textarea']",params.div_form);
         params.contentmsg = $("p[nhname='contentmsg']",params.div_form);
         params.toolbar_container = $("div[nhname='toolbar_container']",params.div_form);
+        params.cancel_btn = $("#new_message_cancel_btn");
         if(params.textarea.data('init') == undefined){
           params.editor = init_editor(params);
           init_form(params);
+          params.cancel_btn.click(function(){
+            nh_reset_form(params);
+          });
 //          $("a[nhname='cancel_btn']",params.div_form).click(function(){
 //            nh_reset_form(params);
 //          });
diff --git a/app/views/words/_new.html.erb b/app/views/words/_new.html.erb
index e81368c1f..0c624ce3d 100644
--- a/app/views/words/_new.html.erb
+++ b/app/views/words/_new.html.erb
@@ -57,6 +57,7 @@
       <p nhname="contentmsg"></p>
       <div style="padding-top:5px;float:left;" nhname="toolbar_container"></div>
       <%= submit_tag l(:button_leave_meassge), :name => nil , :class => "enterprise" , :style => "display: block; float: right;  margin-top: 5px;"%>
+      <a href="javascript:;" id="new_message_cancel_btn" style="display:none;"></a>
     <%else %>
       <div style="font-size: 14px;margin:10px;">
 	    <%= l(:label_user_login_tips) %>
diff --git a/app/views/words/create.js.erb b/app/views/words/create.js.erb
index 4bf7fb244..16f26d5f7 100644
--- a/app/views/words/create.js.erb
+++ b/app/views/words/create.js.erb
@@ -3,4 +3,7 @@ $('#history').html('<%= escape_javascript(render(:partial => 'users/history',:lo
 $('#jour_count').html('<%= @obj_count%>')
 $('#pre_show').html('<%= escape_javascript(render(:partial => 'pre_show', :locals => {:content => nil})) %>');
 $('#new_form_user_message').val("");
+if($('#new_message_cancel_btn') != undefined && $('#new_message_cancel_btn').length!=0){
+  $('#new_message_cancel_btn').click();
+}
 $('#new_form_reference_user_id').val("");
\ No newline at end of file