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 @@

<%= submit_tag l(:button_leave_meassge), :name => nil , :class => "enterprise" , :style => "display: block; float: right; margin-top: 5px;"%> + <%else %>
<%= 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