From 0a898342d97bc6ddd02067a6cd2aa64fc6ee8311 Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Thu, 27 Aug 2015 10:01:13 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=8C=89=E9=92=AE=E5=8F=AF?=
 =?UTF-8?q?=E4=BB=A5=E7=94=A8enter=E9=94=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/account/login.html.erb | 10 ++++++++--
 app/views/layouts/login.html.erb | 14 +++++++++++++-
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/app/views/account/login.html.erb b/app/views/account/login.html.erb
index 816ef4a77..d2c686785 100644
--- a/app/views/account/login.html.erb
+++ b/app/views/account/login.html.erb
@@ -47,6 +47,12 @@
             $("#loginInBox").css({display:"none"});
         }
     });
+
+//    $('#regist_btn').bind('keyup', function(event) {
+//    if (event.keyCode == "13" && $("#signUpBox").css('display') == 'block')) {
+//       register();
+//    }
+//});
     function clearInfo(id, content) {
                 var text = $('#' + id);
                 if (text.val() == content) {
@@ -206,7 +212,7 @@
             </a></div>
         <% end %>
           <div class="loginInButton" >
-            <a href="javascript:void(0);" class="c_white db" onclick="$('#main_login_form').submit();">登录</a>
+            <a href="javascript:void(0);" id="login_btn" class="c_white db" onclick="$('#main_login_form').submit();">登录</a>
           </div>
 
         </div>
@@ -248,7 +254,7 @@
                 </div>
                 我已阅读并接受<a href="<%= agreement_path %>" class="newsBlue"><u>Trustie服务协议</u></a>条款</div>
           <div class="loginUpButton">
-            <a href="javascript:void(0);" class="c_white db" onclick="register();">注册</a>
+            <a href="javascript:void(0);" class="c_white db" id="regist_btn" onclick="register();">注册</a>
 
           </div>
           <% end %>
diff --git a/app/views/layouts/login.html.erb b/app/views/layouts/login.html.erb
index 81b647b65..e7810d45a 100644
--- a/app/views/layouts/login.html.erb
+++ b/app/views/layouts/login.html.erb
@@ -15,7 +15,19 @@
   <%= call_hook :view_layouts_base_html_head %>
   <%= yield :header_tags -%>
 </head>
-
+<
+<script type="text/javascript" charset="utf-8">
+    $(function() {
+        $(document).keyup(function (e) {
+            var e = e || event,
+            code = e.which || e.keyCode;
+            if (code == 13 && $("#loginInBox").css('display') == 'block') {
+                e.preventDefault();
+                $('#main_login_form').submit();
+            }
+        });
+    });
+</script>
 <div class="navContainer">
     <% is_current_user = User.current.logged? && User.current == @user%>
     <% if User.current.logged? %>