Changeset 527 in subversion

Timestamp:

Mar 28, 2007 6:39:38 AM (6 years ago)

Author:

thomasb

Message:

Abstract event keycode detection

Location:

trunk/roundcubemail/program/js

Files:

• app.js (modified) (4 diffs)
• common.js (modified) (1 diff)

trunk/roundcubemail/program/js/app.js

@@ -1639 +1639 @@
   this.login_user_keypress = function(e)
   {
-    if (!e)
-      e = window.event;
-    var key = e.keyCode ? e.keyCode : e.which;
+    var key = rcube_event.get_keycode(e);
+    var elm;
 
     // enter
-    if ((key==13) && (document.form._pass))
-    {
-      rcube_find_object('_pass').focus();
+    if ((key==13) && (elm = rcube_find_object('_pass')))
+    {
+      elm.focus();
       return false;
     }
@@ -1987 +1986 @@
       clearTimeout(this.ksearch_timer);
 
-    if (!e)
-      e = window.event;
-      
     var highlight;
-    var key = e.keyCode ? e.keyCode : e.which;
+    var key = rcube_event.get_keycode(e);
+    var mod = rcube_event.get_modifier(e);
 
     switch (key)
@@ -2023 +2020 @@
 
       case 9:  // tab
-        if(e.shiftKey)
+        if(mod == SHIFT_KEY)
           break;
 
@@ -2532 +2529 @@
   this.name_input_keypress = function(e)
     {
-    var key = document.all ? event.keyCode : document.getElementById ? e.keyCode : 0;
+    var key = rcube_event.get_keycode(e);
 
     // enter

trunk/roundcubemail/program/js/common.js

@@ -103 +103 @@
 // static functions for event handling
 var rcube_event = {
+
+ /**
+  * returns the event key code
+  */
+ get_keycode: function(e)
+ {
+   e = e || window.event;
+   return e && e.keyCode ? e.keyCode : (e && e.which ? e.which : 0);
+ },
 
 /**