From 335bb830d6e893be4ba2433c3daeac8f455eca87 Mon Sep 17 00:00:00 2001 From: "Berend.Cornelius%sun.com" Date: Wed, 21 May 2008 15:35:36 +0000 Subject: [PATCH] resolved a bad conflict resolution git-svn-id: svn://10.0.0.236/branches/MOZILLA_1_8_BRANCH@251752 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/calendar/base/content/agenda-listbox.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/mozilla/calendar/base/content/agenda-listbox.js b/mozilla/calendar/base/content/agenda-listbox.js index 0237f32ab80..467d2957220 100644 --- a/mozilla/calendar/base/content/agenda-listbox.js +++ b/mozilla/calendar/base/content/agenda-listbox.js @@ -204,7 +204,7 @@ agendaListbox.editSelectedItem = function editSelectedItem(aEvent) { var listItem = document.getElementById("agenda-listbox").selectedItem; if (listItem) { - modifyEventWithDialog(getOccurrenceOrParent(listItem.occurrence)); + modifyEventWithDialog(listItem.occurrence, null, true); } } @@ -414,7 +414,9 @@ function deleteSelectedItem(aDoNotConfirm) { agendaListbox.createOrEditEvent = function createOrEditEvent(aEvent) { if (aEvent.target instanceof Components.interfaces.nsIDOMXULSelectControlItemElement) { - document.getElementById('agenda_edit_event_command').doCommand(); + if (this.isEventListItem(aEvent.target)) { + document.getElementById('agenda_edit_event_command').doCommand(); + } } else { // Create new event for the date currently displayed in the agenda. Setting