Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolved a bad conflict resolution

Browse Source 
git-svn-id: svn://10.0.0.236/branches/MOZILLA_1_8_BRANCH@251752 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
Berend.Cornelius%sun.com
2008-05-21 15:35:36 +00:00
parent 47337b6aa0
commit 335bb830d6
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mozilla/calendar/base/content/agenda-listbox.js
View File

@@ -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