From 1c5be3fbe68560b5af2e78192f796e1e2b37be5e Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Thu, 26 Aug 2010 17:21:41 +0000 Subject: [PATCH] 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 | 3 ++- UI/WebServerResources/MailerUI.js | 3 ++- UI/WebServerResources/SchedulerUI.js | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/UI/WebServerResources/ContactsUI.js b/UI/WebServerResources/ContactsUI.js index 01b75f7a3..a398fa8b1 100644 --- a/UI/WebServerResources/ContactsUI.js +++ b/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); } diff --git a/UI/WebServerResources/MailerUI.js b/UI/WebServerResources/MailerUI.js index 9407a9858..aba747238 100644 --- a/UI/WebServerResources/MailerUI.js +++ b/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); } diff --git a/UI/WebServerResources/SchedulerUI.js b/UI/WebServerResources/SchedulerUI.js index fd166d04e..095d8a5a9 100644 --- a/UI/WebServerResources/SchedulerUI.js +++ b/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); }