From 73fdbddc367c874d2a0a7221db36d5d9d5176490 Mon Sep 17 00:00:00 2001
From: "Berend.Cornelius%sun.com"
 <Berend.Cornelius%sun.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Tue, 18 Sep 2007 13:45:48 +0000
Subject: [PATCH] Bug 359443 - Deleting item from Agenda deletes an email
 instead; r=mickey

git-svn-id: svn://10.0.0.236/trunk@236210 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../lightning/content/agenda-tree-overlay.xul |  1 +
 .../calendar/lightning/content/agenda-tree.js | 38 +++++++++++++++++++
 .../content/messenger-overlay-sidebar.xul     |  1 +
 3 files changed, 40 insertions(+)

diff --git a/mozilla/calendar/lightning/content/agenda-tree-overlay.xul b/mozilla/calendar/lightning/content/agenda-tree-overlay.xul
index bca9638f9e8..2337e1abb7c 100644
--- a/mozilla/calendar/lightning/content/agenda-tree-overlay.xul
+++ b/mozilla/calendar/lightning/content/agenda-tree-overlay.xul
@@ -63,6 +63,7 @@
   </hbox>
   <deck id="agenda-viewcustomize-deck" selectedIndex="0" flex="1">
     <tree id="agenda-tree" hidecolumnpicker="true" flex="1"
+          onkeypress="agendaTreeView.onKeyPress(event);"
           ondblclick="agendaTreeView.onDoubleClick(event);">
       <treecols>
         <treecol id="col-agenda-item" primary="true"
diff --git a/mozilla/calendar/lightning/content/agenda-tree.js b/mozilla/calendar/lightning/content/agenda-tree.js
index 65c608b797f..2f7adf30ddb 100644
--- a/mozilla/calendar/lightning/content/agenda-tree.js
+++ b/mozilla/calendar/lightning/content/agenda-tree.js
@@ -356,6 +356,44 @@ function agendaDoubleClick(event)
     }
 }
 
+agendaTreeView.onKeyPress =
+function onKeyPress(event)
+{
+  const kKE = Ci.nsIDOMKeyEvent;
+  switch(event.keyCode) {
+    case kKE.DOM_VK_DELETE:
+      document.getElementById('agenda_new_event_command').doCommand();
+      event.stopPropagation();
+      event.preventDefault();
+      break;
+  }
+};
+
+/**
+ *  Delete the current selected item with focus from the Agenda- list
+ */
+agendaTreeView.deleteEvent = 
+function deleteAgendaEvent(aDoNotConfirm)
+{
+   var selectedItems = new Array();
+   var tree = document.getElementById("agenda-tree");
+   var start = new Object();
+   var end = new Object();
+   var numRanges = tree.view.selection.getRangeCount();
+   var agendaItem;
+   for (var t = 0; t < numRanges; t++) {
+      tree.view.selection.getRangeAt(t, start, end);
+      for (var v = start.value; v <= end.value; v++) {
+        selectedItems.push(this.events[v]);
+      }
+   }
+   calendarViewController.deleteOccurrences(selectedItems.length,
+                                            selectedItems,
+                                            false,
+                                            aDoNotConfirm);
+};
+
+
 agendaTreeView.deleteItem =
 function deleteItem(item)
 {
diff --git a/mozilla/calendar/lightning/content/messenger-overlay-sidebar.xul b/mozilla/calendar/lightning/content/messenger-overlay-sidebar.xul
index 4484716d4b9..a52a2154df3 100644
--- a/mozilla/calendar/lightning/content/messenger-overlay-sidebar.xul
+++ b/mozilla/calendar/lightning/content/messenger-overlay-sidebar.xul
@@ -178,6 +178,7 @@
     <broadcaster id="is_editable" hidden="false"/>
   </broadcasterset>
   <commandset id="calendar_commands">
+    <command id="agenda_new_event_command" oncommand="agendaTreeView.deleteEvent()"/>
     <command id="calendar_new_event_command" oncommand="createEventWithDialog(getSelectedCalendar());"/>
     <command id="calendar_new_todo_command" oncommand="createTodoWithDialog(getSelectedCalendar());"/>
     <command id="calendar_new_calendar_command" oncommand="openCalendarWizard();"/>