merge of '7acfed7c7506c279e2946ae835c4ef8a1cf52114'

and 'ef38d39938984cb34954a23cdc1d54fecf577117'

Monotone-Parent: 7acfed7c7506c279e2946ae835c4ef8a1cf52114
Monotone-Parent: ef38d39938984cb34954a23cdc1d54fecf577117
Monotone-Revision: d4edd90811440e920dfccfcb2c0e4305732b5cfc

Monotone-Author: crobert@inverse.ca
Monotone-Date: 2009-07-02T15:41:00
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
C Robert
2009-07-02 15:41:00 +00:00
3 changed files with 110 additions and 5 deletions
+3 -1
View File
@@ -406,7 +406,9 @@ function onViewEventCallback(http) {
}
function editDoubleClickedEvent(event) {
if (this.recurrenceTime && !this.isException)
if (this.isException && this.recurrenceTime)
_editEventId(this.cname, this.calendar, "occurence" + this.recurrenceTime);
else if (this.recurrenceTime)
_editRecurrenceDialog(this, "confirmEditing");
else
_editEventId(this.cname, this.calendar);