Monotone-Parent: 59ba21ee6940ddf75f7560f3d2986a0bbc1f5c12

Monotone-Revision: 7a136da813c9771632c72c06589d2cb6383ef052

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2010-08-26T17:21:41
Monotone-Branch: ca.inverse.sogo

UI/WebServerResources/ContactsUI.js

@@ -1196,7 +1196,8 @@ function onDocumentKeydown(event) {
                 Event.stop(event);
             }
         }
-        else if (event.ctrlKey == 1 && event.keyCode == 65) {  // Ctrl-A
+        else if (((isMac() && event.metaKey == 1) || (!isMac() && event.ctrlKey == 1))
+                 && event.keyCode == 65) {  // Ctrl-A
             $("contactsList").selectAll();
             Event.stop(event);
         }

UI/WebServerResources/MailerUI.js

@@ -357,7 +357,8 @@ function onDocumentKeydown(event) {
                 Event.stop(event);
             }
         }
-	else if (event.ctrlKey == 1 && event.keyCode == 65) {  // Ctrl-A
+	else if (((isMac() && event.metaKey == 1) || (!isMac() && event.ctrlKey == 1))
+                 && event.keyCode == 65) {  // Ctrl-A
             $("messageListBody").down("TBODY").selectAll();
             Event.stop(event);
         }

UI/WebServerResources/SchedulerUI.js

@@ -2845,7 +2845,8 @@ function onDocumentKeydown(event) {
             deleteEvent();
             event.stop();
         }
-        else if (event.ctrlKey == 1 && event.keyCode == 65) {  // Ctrl-A
+        else if (((isMac() && event.metaKey == 1) || (!isMac() && event.ctrlKey == 1))
+                 && event.keyCode == 65) {  // Ctrl-A
             onSelectAll(event);
             Event.stop(event);
          }