From a74409fa048e7a3a58d9a74c868e4037e9fa785e Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Fri, 31 Jul 2015 15:18:57 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E5=A4=8D=E5=AD=90=E7=95=99=E8=A8=80?= =?UTF-8?q?=E4=B8=8D=E6=88=90=E5=8A=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/_user_jour_reply.html.erb | 2 +- app/views/words/create_reply.js.erb | 5 ++++- public/javascripts/user.js | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/app/views/users/_user_jour_reply.html.erb b/app/views/users/_user_jour_reply.html.erb index eb44852bb..8822fdc56 100644 --- a/app/views/users/_user_jour_reply.html.erb +++ b/app/views/users/_user_jour_reply.html.erb @@ -26,7 +26,7 @@ - +

取消 diff --git a/app/views/words/create_reply.js.erb b/app/views/words/create_reply.js.erb index a7f0b42c7..6aad1bfb5 100644 --- a/app/views/words/create_reply.js.erb +++ b/app/views/words/create_reply.js.erb @@ -1,7 +1,10 @@ <% if @save_succ %> <% if !@jfm.nil? && @jfm.jour_type == 'Principal' %> $("#<%= @jfm.m_parent_id%>").children("div[nhname='reply_list']").prepend("<%= escape_javascript( render(:partial => 'users/user_jour_reply',:locals => {:reply=>@jfm} )) %>"); - $("#<%= @jfm.m_reply_id%>").children("div[nhname='div_form']").hide(); + div_1 = $("#<%= @jfm.m_reply_id%>").children("div[nhname='div_form']"); + div_1.hide(); + div_2 = $("#<%= @jfm.m_reply_id%>").children("div[nhname='sub_div_form']"); + div_2.hide(); <% else %> var pre_append = $('<%= j( diff --git a/public/javascripts/user.js b/public/javascripts/user.js index 30bc44120..c7690a015 100644 --- a/public/javascripts/user.js +++ b/public/javascripts/user.js @@ -110,7 +110,7 @@ $(function(){ 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 = $("textarea[name='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);