From a52c9062170586f16c4825778fc505853ee7f419 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 31 Jul 2015 14:18:32 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=95=99=E8=A8=80=E7=95=8C?=
=?UTF-8?q?=E9=9D=A2=E6=8F=92=E4=BB=B6=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/views/users/_user_jour_reply.html.erb | 14 +++++-----
public/javascripts/user.js | 34 +++++++++++++++++++++++
2 files changed, 41 insertions(+), 7 deletions(-)
diff --git a/app/views/users/_user_jour_reply.html.erb b/app/views/users/_user_jour_reply.html.erb
index 8f775c0fa..eb44852bb 100644
--- a/app/views/users/_user_jour_reply.html.erb
+++ b/app/views/users/_user_jour_reply.html.erb
@@ -13,24 +13,24 @@
<%= time_tag(reply.created_on).html_safe%>
- <%= link_to l(:button_reply),'javascript:void(0);',:nhname=>"reply_btn", :class => "ml5 c_purple" %>
+ <%= link_to l(:button_reply),'javascript:void(0);',:nhname=>"sub_reply_btn", :class => "ml5 c_purple" %>
<% if User.current.admin? || reply.user == User.current%>
<%= link_to(l(:label_newfeedback_delete), {:controller => 'words', :action => 'destroy', :object_id => reply, :user_id => reply.user},
:remote => true, :confirm => l(:text_are_you_sure), :method => 'delete', :class => "c_purple ml5", :title => l(:button_delete)) %>
<% end %>
-
+
diff --git a/public/javascripts/user.js b/public/javascripts/user.js
index 5cf18590a..30bc44120 100644
--- a/public/javascripts/user.js
+++ b/public/javascripts/user.js
@@ -104,6 +104,40 @@ $(function(){
},300);
});
+ $("a[nhname='sub_reply_btn']").live('click',function(){
+ var params = {};
+ params.kindutil = K;
+ params.container = $(this).parent().parent('div');
+ params.div_form = $("div[nhname='sub_div_form']",params.container);
+ params.form = $("form",params.div_form);
+ params.textarea = $("textarea[name='sub_user_notes']",params.div_form);
+ params.textarea.prev('div').css("height","60px");
+ params.contentmsg = $("p[nhname='sub_contentmsg']",params.div_form);
+ params.toolbar_container = $("div[nhname='sub_toolbar_container']",params.div_form);
+ params.cancel_btn = $("a[nhname='sub_cancel_btn']",params.div_form);
+ params.submit_btn = $("a[nhname='sub_submit_btn']",params.div_form);
+ if(params.textarea.data('init') == undefined){
+ params.editor = init_editor(params);
+ init_form(params);
+ params.cancel_btn.click(function(){
+ nh_reset_form(params);
+ toggleAndSettingWordsVal(params.div_form, params.textarea);
+ });
+ params.submit_btn.click(function(){
+ params.form.submit();
+ });
+ params.textarea.data('init',1);
+ }
+ params.cancel_btn.click();
+ setTimeout(function(){
+ if(!params.div_form.is(':hidden')){
+ params.textarea.show();
+ params.textarea.focus();
+ params.textarea.hide();
+ }
+ },300);
+ });
+
$("div[nhname='new_message']").each(function(){
var params = {};
params.kindutil = K;