From f8de900dd7ae1264fbfa3afde296001cf6f85b48 Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Thu, 15 Apr 2010 22:19:28 +0000
Subject: [PATCH] Monotone-Parent: 9f58c2b185464d4b3aca8502388330507e0621ab
 Monotone-Revision: 3a8cd7db86f49087aed77cc4fba9b7ce69fa8b50

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2010-04-15T22:19:28
Monotone-Branch: ca.inverse.sogo
---
 ChangeLog                            | 5 +++++
 UI/WebServerResources/SchedulerUI.js | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index efb863ebf..128a8f68a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2010-04-15  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* UI/WebServerResources/SchedulerUI.js (onDocumentKeydown): when
+	deleting an event, we must make sure that the even dialog
+	disappears, as it the case with the click on the corresponding
+	toolbar button.
+
 	* Tools/SOGoToolRemove.m: new sogo-tool utility to remove user
 	data from the database.
 
diff --git a/UI/WebServerResources/SchedulerUI.js b/UI/WebServerResources/SchedulerUI.js
index abce95983..27a447be1 100644
--- a/UI/WebServerResources/SchedulerUI.js
+++ b/UI/WebServerResources/SchedulerUI.js
@@ -2555,8 +2555,9 @@ function onDocumentKeydown(event) {
     if (target.tagName != "INPUT") {
         if (event.keyCode == Event.KEY_DELETE
             || (event.keyCode == Event.KEY_BACKSPACE && isMac())) {
+            $("eventDialog").hide();
             deleteEvent();
-            Event.stop(event);
+            event.stop();
         }
     }
 }