From aa8d1741f99c8c751f8b8d7578c941381e19a75d Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 13 Mar 2015 15:46:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE=E5=8F=91?=
 =?UTF-8?q?=E9=80=81=E9=82=AE=E7=AE=B1=E6=97=B6=E7=9A=84=E6=AD=A3=E5=88=99?=
 =?UTF-8?q?=E9=AA=8C=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../projects/invite_members_by_mail.html.erb  | 22 +++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/app/views/projects/invite_members_by_mail.html.erb b/app/views/projects/invite_members_by_mail.html.erb
index e8e77be8f..63f69e120 100644
--- a/app/views/projects/invite_members_by_mail.html.erb
+++ b/app/views/projects/invite_members_by_mail.html.erb
@@ -1,14 +1,28 @@
 <script>
     function verifyAddress() {
-        var email = $('#mail').val();
+        var email = $.trim($('#mail').val());
         var filter = /^([a-zA-Z0-9_\.\-])+\@(([a-zA-Z0-9\-])+\.)+([a-zA-Z0-9]{2,4})+$/;
-        if (email == "" || filter.test(email)) {
+        if(email == "")
+        {
+            $("#valid_email").html("电子邮件不能为空");
+        }
+        else if (filter.test(email)) {
             $("#valid_email").html("");
+            return true;
         }
         else
         {
             $("#valid_email").html("您所填写的电子邮件格式不正确");
         }
+        return false;
+    }
+
+    function senderEmail(obj)
+    {
+        if(verifyAddress())
+        {
+            obj.parent().submit();
+        }
     }
 
 
@@ -40,10 +54,10 @@
 		</div>
 			<%= form_tag('send_mail_to_member', :controller => 'projects',:action => 'send_mail_to_member', method: 'get') do %>
 				<span id="valid_email" style="color: #FF0000;"></span>
-                <%= text_field_tag 'mail',  '', :class => "fb_item fl", :placeholder => l(:label_input_email), :onblur => "verifyAddress();" %>
+                <%= text_field_tag 'mail',  '', :class => "fb_item fl", :placeholder => l(:label_input_email), :onkeyup => "verifyAddress();" %>
                 <div class="cl"></div>
                 <div class="cl"></div>
-                <a href="#" class="btn_free" onclick="$(this).parent().submit();">
+                <a href="#" class="btn_free" onclick="senderEmail($(this));">
                     <%= l(:label_send_email)%>
                 </a>
 				<%#= submit_tag '免费发送', :style => "display:block; width:80px; text-align:center; color:#fff; height:26px; padding-top:3px; margin-bottom:10px;" %>