LupusNobilis
/
sogo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

See Changelog. 

Monotone-Parent: 7be471a6a7e6a2c4d99f470e9617461175519459
Monotone-Revision: f02a11f1e1e720bc3a1a26a301b2b216d5335eb9

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2010-10-08T20:57:24
Monotone-Branch: ca.inverse.sogo
maint-2.0.2
Francis Lachapelle 2010-10-08 20:57:24 +00:00
parent 118a5887ea
commit f7a904b977
4 changed files with 52 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -11,6 +11,14 @@
(onCalendarSelectEvent): don't clear the selection if the
contextual menu is going to appear.
* UI/WebServerResources/ContactsUI.js (onDocumentKeydown):
improved character key identification to fix a bug with some
browsers.
* UI/WebServerResources/MailerUI.js (onDocumentKeydown): idem.
* UI/WebServerResources/SchedulerUI.js (onDocumentKeydown): idem.
2010-10-08 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* SoObjects/Appointments/SOGoAppointmentFolder.m

22
UI/WebServerResources/ContactsUI.js
View File

@ -1159,18 +1159,25 @@ function onWindowResize(event) {
function onDocumentKeydown(event) {
var target = Event.element(event);
if (target.tagName != "INPUT")
if (event.keyCode == Event.KEY_DELETE ||
event.keyCode == Event.KEY_BACKSPACE && isMac()) {
if (target.tagName != "INPUT") {
var keyCode = event.keyCode;
if (!keyCode) {
keyCode = event.charCode;
if (keyCode == "a".charCodeAt(0)) {
keyCode = "A".charCodeAt(0);
}
}
if (keyCode == Event.KEY_DELETE ||
keyCode == Event.KEY_BACKSPACE && isMac()) {
onToolbarDeleteSelectedContacts();
Event.stop(event);
}
else if (event.keyCode == Event.KEY_DOWN ||
event.keyCode == Event.KEY_UP) {
else if (keyCode == Event.KEY_DOWN ||
keyCode == Event.KEY_UP) {
if (Contact.currentContact) {
var row = $(Contact.currentContact);
var nextRow;
if (event.keyCode == Event.KEY_DOWN)
if (keyCode == Event.KEY_DOWN)
nextRow = row.next("tr");
else
nextRow = row.previous("tr");
@ -1198,10 +1205,11 @@ function onDocumentKeydown(event) {
}
}
else if (((isMac() && event.metaKey == 1) || (!isMac() && event.ctrlKey == 1))
&& event.keyCode == 65) { // Ctrl-A
&& keyCode == "A".charCodeAt(0)) { // Ctrl-A
$("contactsList").selectAll();
Event.stop(event);
}
}
}
/*function fixSearchFieldPosition () {

20
UI/WebServerResources/MailerUI.js
View File

@ -319,17 +319,25 @@ function onUnload(event) {
function onDocumentKeydown(event) {
var target = Event.element(event);
if (target.tagName != "INPUT") {
if (event.keyCode == Event.KEY_DELETE ||
event.keyCode == Event.KEY_BACKSPACE && isMac()) {
var keyCode = event.keyCode;
if (!keyCode) {
keyCode = event.charCode;
if (keyCode == "a".charCodeAt(0)) {
keyCode = "A".charCodeAt(0);
}
}
if (keyCode == Event.KEY_DELETE ||
keyCode == Event.KEY_BACKSPACE && isMac()) {
deleteSelectedMessages();
Event.stop(event);
}
else if (event.keyCode == Event.KEY_DOWN ||
event.keyCode == Event.KEY_UP) {
else if (keyCode == Event.KEY_DOWN ||
keyCode == Event.KEY_UP) {
if (Mailer.currentMessages[Mailer.currentMailbox]) {
var row = $("row_" + Mailer.currentMessages[Mailer.currentMailbox]);
var nextRow;
if (event.keyCode == Event.KEY_DOWN)
if (keyCode == Event.KEY_DOWN)
nextRow = row.next("tr");
else
nextRow = row.previous("tr");
@ -358,7 +366,7 @@ function onDocumentKeydown(event) {
}
}
else if (((isMac() && event.metaKey == 1) || (!isMac() && event.ctrlKey == 1))
&& event.keyCode == 65) { // Ctrl-A
&& keyCode == "A".charCodeAt(0)) { // Ctrl-A
$("messageListBody").down("TBODY").selectAll();
Event.stop(event);
}

20
UI/WebServerResources/SchedulerUI.js
View File

@ -2863,23 +2863,33 @@ function drawNowLine () {
function onDocumentKeydown(event) {
var target = Event.element(event);
if (target.tagName != "INPUT") {
if (event.keyCode == Event.KEY_DELETE
|| (event.keyCode == Event.KEY_BACKSPACE && isMac())) {
var keyCode = event.keyCode;
if (!keyCode) {
keyCode = event.charCode;
if (keyCode == "a".charCodeAt(0))
keyCode = "A".charCodeAt(0);
else if (keyCode == "c".charCodeAt(0))
keyCode = "C".charCodeAt(0);
else if (keyCode == "v".charCodeAt(0))
keyCode = "V".charCodeAt(0);
}
if (keyCode == Event.KEY_DELETE
|| (keyCode == Event.KEY_BACKSPACE && isMac())) {
$("eventDialog").hide();
deleteEvent();
event.stop();
}
else if (((isMac() && event.metaKey == 1) || (!isMac() && event.ctrlKey == 1))
&& event.keyCode == 65) { // Ctrl-A
&& keyCode == "A".charCodeAt(0)) { // Ctrl-A
onSelectAll(event);
Event.stop(event);
}
else if (((isMac() && event.metaKey == 1) || (!isMac() && event.ctrlKey == 1))
&& event.keyCode == 67) { // Ctrl-C
&& keyCode == "C".charCodeAt(0)) { // Ctrl-C
copyEventToClipboard();
}
else if (((isMac() && event.metaKey == 1) || (!isMac() && event.ctrlKey == 1))
&& event.keyCode == 86) { // Ctrl-V
&& keyCode == "V".charCodeAt(0)) { // Ctrl-V
copyEventFromClipboard();
}
}