From cf9f33fce7fb3fde97129505e80eb11b0eb14f62 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Mon, 27 Oct 2014 14:29:49 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=96=E6=B6=88=E5=9B=9E=E5=A4=8D=E5=B8=96?=
 =?UTF-8?q?=E5=AD=90=E6=97=B6=E5=AF=B9=E4=B8=BB=E9=A2=98=E7=9A=84js?=
 =?UTF-8?q?=E9=AA=8C=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/messages/_course_show.html.erb  |  4 ++--
 app/views/messages/_form.html.erb         |  6 ++++-
 app/views/messages/_project_show.html.erb | 27 +++++++++++++++++++++--
 3 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/app/views/messages/_course_show.html.erb b/app/views/messages/_course_show.html.erb
index 5459e1c17..40094b162 100644
--- a/app/views/messages/_course_show.html.erb
+++ b/app/views/messages/_course_show.html.erb
@@ -181,7 +181,7 @@
     <div id="reply" style="display:none;">
       <%= form_for @reply, :as => :reply, :url => {:action => 'reply', :id => @topic}, :html => {:multipart => true, :id => 'message-form'} do |f| %>
           <%= render :partial => 'form', :locals => {:f => f, :replying => true} %>
-          <input type="button" class="enterprise" value="<%=l(:button_submit) %>" onmousemove="regexContent()" onclick="submit_message_replay();" >
+          <input type="button" class="enterprise" value="<%=l(:button_submit) %>" onclick="submit_message_replay();" >
       <% end %>
       <div id="preview" class="wiki"></div>
     </div>
@@ -190,7 +190,7 @@
 <% html_title @topic.subject %>
 
 <script type="text/javascript">
-    var flag = false
+    var flag = false;
     jQuery(document).ready(function($) {
         transpotUrl('#content');
     });
diff --git a/app/views/messages/_form.html.erb b/app/views/messages/_form.html.erb
index 387e91c26..ab3ec08cb 100644
--- a/app/views/messages/_form.html.erb
+++ b/app/views/messages/_form.html.erb
@@ -46,7 +46,11 @@
       <span class="required"> *&nbsp;&nbsp;</span>
     </label>
     <br/>
-    <%= f.text_field :subject, { size: 60, style: "width: 99%;", id: "message_subject", onblur: "regexSubject();" }.merge(extra_option) %>
+    <% if replying %>
+        <%= f.text_field :subject, { size: 60, style: "width: 99%;", id: "message_subject" }.merge(extra_option) %>
+    <% else %>
+        <%= f.text_field :subject, { size: 60, style: "width: 99%;", id: "message_subject", onblur: "regexSubject();" }.merge(extra_option) %>
+    <% end %>
     <span id="subject_span"></span>
   </p>
   <p>
diff --git a/app/views/messages/_project_show.html.erb b/app/views/messages/_project_show.html.erb
index 2dc0d89c2..98a1a5767 100644
--- a/app/views/messages/_project_show.html.erb
+++ b/app/views/messages/_project_show.html.erb
@@ -181,15 +181,38 @@
     <div id="reply" style="display:none;">
       <%= form_for @reply, :as => :reply, :url => {:action => 'reply', :id => @topic}, :html => {:multipart => true, :id => 'message-form'} do |f| %>
           <%= render :partial => 'form', :locals => {:f => f, :replying => true} %>
-          <%= submit_tag l(:button_submit) %>
-          <%= preview_link({:controller => 'messages', :action => 'preview', :board_id => @board}, 'message-form') %>
+          <input type="button" class="enterprise" value="<%=l(:button_submit) %>" onclick="submit_message_replay();" >
       <% end %>
       <div id="preview" class="wiki"></div>
     </div>
 <% end %>
 <% html_title @topic.subject %>
 <script type="text/javascript">
+    var flag = false;
     jQuery(document).ready(function($) {
         transpotUrl('#content');
     });
+    function submit_message_replay()
+    {
+        if(flag)
+        {
+            $("#message-form").submit();
+        }
+    }
+    function regexContent()
+    {
+        var content = $.trim($("#message_content").val());
+        if(content.length ==0)
+        {
+            $("#message_content_span").text("<%= l(:label_reply_empty) %>");
+            $("#message_content_span").css('color','#ff0000');
+            flag =  false;
+        }
+        else
+        {
+            $("#message_content_span").text("<%= l(:label_field_correct) %>");
+            $("#message_content_span").css('color','#008000');
+            flag = true;
+        }
+    }
 </script>
\ No newline at end of file