From e138292f2a9a01762a5b3b0647645a270fe0eaae Mon Sep 17 00:00:00 2001
From: yutao <283765470@qq.com>
Date: Fri, 12 Jun 2015 16:31:29 +0800
Subject: [PATCH] ...

---
 app/views/courses/_courses_jours.html.erb     | 6 ++++--
 app/views/courses/_history.html.erb           | 3 ++-
 app/views/projects/_history.html.erb          | 3 ++-
 app/views/projects/_project_jours.html.erb    | 6 ++++--
 app/views/users/_history.html.erb             | 3 ++-
 app/views/users/_user_jours.html.erb          | 6 ++++--
 app/views/words/_journal_reply_items.html.erb | 3 ++-
 7 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/app/views/courses/_courses_jours.html.erb b/app/views/courses/_courses_jours.html.erb
index e3eba9151..28dfbe786 100644
--- a/app/views/courses/_courses_jours.html.erb
+++ b/app/views/courses/_courses_jours.html.erb
@@ -49,6 +49,7 @@
 
 <script type="text/javascript">
   $(function(){
+
     function init_editor(params){
       var editor = params.kindutil.create(params.textarea, {
         resizeType : 1,minWidth:"1px",width:"100%",height:"150px",
@@ -166,6 +167,7 @@
           });
         }
         params.cancel_btn.click();
+        toggleAndSettingWordsVal(params.div_form, params.textarea);
         setTimeout(function(){
           if(!params.div_form.is(':hidden')){
             params.textarea.show();
@@ -187,8 +189,8 @@
           return;
         }
         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.contentmsg = $("p[nhname='contentmsg']",params.div_form);
+        params.toolbar_container = $("div[nhname='toolbar_container']",params.div_form);
         if(params.textarea.data('init') == undefined){
           params.editor = init_editor(params);
           init_form(params);
diff --git a/app/views/courses/_history.html.erb b/app/views/courses/_history.html.erb
index 3dc9aeba5..e5f5fc0ec 100644
--- a/app/views/courses/_history.html.erb
+++ b/app/views/courses/_history.html.erb
@@ -29,8 +29,9 @@
                                   :class => "delete", :title => l(:button_delete))  %>
                     <% end %>
                     <% if reply_allow %>
-                        <%= link_to l(:label_bid_respond_quote),'',
+                        <%#= link_to l(:label_bid_respond_quote),'',
                                 {:focus => 'project_respond',:nhname=>"reply_btn", :onclick => "toggleAndSettingWordsVal($('##{ids}'), $('##{ids} textarea')); $('##{ids} textarea') ;return false;"} %>
+                        <%= link_to l(:label_bid_respond_quote),'javascript:;',{:nhname=>"reply_btn"} %>
                     <% end %>
                 </div>
                   <div class="cl"></div>
diff --git a/app/views/projects/_history.html.erb b/app/views/projects/_history.html.erb
index 4c29552e9..d85906a2c 100644
--- a/app/views/projects/_history.html.erb
+++ b/app/views/projects/_history.html.erb
@@ -20,8 +20,9 @@
                                   :class => "delete", :title => l(:button_delete))  %>
                     <% end %>
                     <% if reply_allow %>
-                        <%= link_to l(:label_bid_respond_quote),'',
+                        <%#= link_to l(:label_bid_respond_quote),'',
                                     {:focus => 'project_respond',:nhname=>"reply_btn", :onclick => "toggleAndSettingWordsVal($('##{ids}'), $('##{ids} textarea')); $('##{ids} textarea') ;return false;"} %>
+                        <%= link_to l(:label_bid_respond_quote),'javascript:;', {:nhname=>"reply_btn"} %>
 
                     <% end %>
                 </span>
diff --git a/app/views/projects/_project_jours.html.erb b/app/views/projects/_project_jours.html.erb
index 5692afcf5..2079d42f9 100644
--- a/app/views/projects/_project_jours.html.erb
+++ b/app/views/projects/_project_jours.html.erb
@@ -43,6 +43,7 @@
 <div style="display:none;"><a href="#" id="nhjump"></a></div>
 <script type="text/javascript">
   $(function(){
+
     function init_editor(params){
       var editor = params.kindutil.create(params.textarea, {
         resizeType : 1,minWidth:"1px",width:"100%",height:"150px",
@@ -160,6 +161,7 @@
           });
         }
         params.cancel_btn.click();
+        toggleAndSettingWordsVal(params.div_form, params.textarea);
         setTimeout(function(){
           if(!params.div_form.is(':hidden')){
             params.textarea.show();
@@ -181,8 +183,8 @@
           return;
         }
         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.contentmsg = $("p[nhname='contentmsg']",params.div_form);
+        params.toolbar_container = $("div[nhname='toolbar_container']",params.div_form);
         if(params.textarea.data('init') == undefined){
           params.editor = init_editor(params);
           init_form(params);
diff --git a/app/views/users/_history.html.erb b/app/views/users/_history.html.erb
index 3daa6cc7d..8902b7dfc 100644
--- a/app/views/users/_history.html.erb
+++ b/app/views/users/_history.html.erb
@@ -23,8 +23,9 @@
                                   :class => "delete", :title => l(:button_delete))  %>
                     <% end %>
                     <% if reply_allow %>
-                        <%= link_to l(:label_bid_respond_quote),'',
+                        <%#= link_to l(:label_bid_respond_quote),'',
                                     {:focus => 'project_respond',:nhname=>'reply_btn', :onclick => "toggleAndSettingWordsVal($('##{ids}'), $('##{ids} textarea')); $('##{ids} textarea') ;return false;"} %>
+                        <%= link_to l(:label_bid_respond_quote),'javascript:;',{:nhname=>'reply_btn'} %>
 
                     <% end %>
                 </span>
diff --git a/app/views/users/_user_jours.html.erb b/app/views/users/_user_jours.html.erb
index a2f6f8cb4..3d7496fb2 100644
--- a/app/views/users/_user_jours.html.erb
+++ b/app/views/users/_user_jours.html.erb
@@ -67,6 +67,7 @@
 <div style="display:none;"><a href="#" id="nhjump"></a></div>
 <script type="text/javascript">
   $(function(){
+
     function init_editor(params){
       var editor = params.kindutil.create(params.textarea, {
         resizeType : 1,minWidth:"1px",width:"100%",height:"150px",
@@ -188,6 +189,7 @@
           });
         }
         params.cancel_btn.click();
+        toggleAndSettingWordsVal(params.div_form, params.textarea);
         setTimeout(function(){
           if(!params.div_form.is(':hidden')){
             params.textarea.show();
@@ -209,8 +211,8 @@
           return;
         }
         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.contentmsg = $("p[nhname='contentmsg']",params.div_form);
+        params.toolbar_container = $("div[nhname='toolbar_container']",params.div_form);
         if(params.textarea.data('init') == undefined){
           params.editor = init_editor(params);
           init_form(params);
diff --git a/app/views/words/_journal_reply_items.html.erb b/app/views/words/_journal_reply_items.html.erb
index 9d4eebd6f..af8be7197 100644
--- a/app/views/words/_journal_reply_items.html.erb
+++ b/app/views/words/_journal_reply_items.html.erb
@@ -33,8 +33,9 @@
                               :remote => true, :confirm => l(:text_are_you_sure), :method => 'delete', :class => "delete", :title => l(:button_delete))  %>
                 <% end %>
               <% if reply_allow %>
-                         <%= link_to l(:button_reply),'',
+                         <%#= link_to l(:button_reply),'',
                                      {:focus => 'project_respond',:nhname=>"reply_btn", :onclick => "toggleAndSettingWordsVal($('##{id}'), $('##{id} textarea'), ''); return false;"} %>
+                         <%= link_to l(:button_reply),'javascript:;',{:nhname=>"reply_btn"} %>
                 <% end %>  <!-- #{l(:label_reply_plural)} #{m_reply_id.user.name}: -->
             </div>
         <div class="cl"></div>