X-Git-Url: http://git.cielonegro.org/gitweb.cgi?p=Rakka.git;a=blobdiff_plain;f=js%2Flogin.js;h=3223bcf2b9466a65307d1b0b007acee1e26418e5;hp=291fa2987d8897f82dcea1051ac953359e0ccefb;hb=5ab256be8bbbb1f4a012b41ac1cc3f9b29aa7d57;hpb=fa79b22a10d1036b41c9bd9c7b832af7286e8cd9

diff --git a/js/login.js b/js/login.js
index 291fa29..3223bcf 100644
--- a/js/login.js
+++ b/js/login.js
@@ -1,5 +1,5 @@
 (function () {
-    
+
     Rakka.showLoginPanel = function () {
         var $area = Rakka.switchScreen();
 
@@ -14,9 +14,26 @@
         var btnLogin
             = $.INPUT({type: "button", value: "Login"});
 
-        $(btnLogin).click(function () {
-            login(fldUserID.value, fldPassword.value);
-        });
+        $(btnLogin)
+            .click(function () {
+                       login(fldUserID.value, fldPassword.value);
+                   });
+
+        var fldHandler = function (ev) {
+                             if (ev.keyCode == 27) { // ESC
+                                 Rakka.restoreScreen();
+                                 return false;
+                             }
+                             else if (ev.keyCode == 13) { // CR
+                                 login(fldUserID.value, fldPassword.value);
+                                 return false;
+                             }
+                             else {
+                                 return true;
+                             }
+        };
+        $(fldUserID).keypress(fldHandler);
+        $(fldPassword).keypress(fldHandler);
 
         var btnCancel
             = $.INPUT({type: "button", value: "Cancel"});
@@ -44,6 +61,7 @@
                      );
 
         $area.append(loginPanel);
+        $(fldUserID).focus();
     };
 
     var login = function (userID, password) {
@@ -86,7 +104,7 @@
     var updateLoginState = function () {
         currentUserID   = null;
         currentPassword = null;
-        
+
         var cookies = document.cookie.split(/;\s*/);
         $.each(cookies, function () {
             var m = this.match(/^([^=]*)=(.*)$/);
@@ -114,10 +132,14 @@
                 });
 
             $("input.newButton").attr({disabled: ""});
-            
+
             $("input.editButton").attr({
                 disabled: (Rakka.isSpecialPage ? "disabled" : "")
             });
+
+            $("input.configButton").attr({
+              disabled: ""
+            });
         }
         else {
             /* ログインしてゐない */
@@ -129,10 +151,14 @@
             $("input.newButton").attr({
                 disabled: (Rakka.isGlobalLocked ? "disabled" : "")
             });
-            
+
             $("input.editButton").attr({
                 disabled: (Rakka.isLocked || Rakka.isGlobalLocked || Rakka.isSpecialPage ? "disabled" : "")
             });
+
+            $("input.configButton").attr({
+                disabled: "disabled"
+            });
         }
     };