Bug 1492435 - Display the occurrence prompt also for expanded occurrences of a series and not just for recurrence items; r=philipp
authorMakeMyDay <makemyday@gmx-topmail.de>
Wed, 19 Sep 2018 14:17:10 +0200
changeset 34098 568b7141662f2bd752fa11939c77bcb0149a8c9a
parent 34097 aa9c13717f77c473dcbb7f10e6af6e5f6c51a2ff
child 34099 e429ae02f1ea0c4569cfa844379cc305e03dc25f
push id389
push userclokep@gmail.com
push dateMon, 18 Mar 2019 19:01:53 +0000
reviewersphilipp
bugs1492435
Bug 1492435 - Display the occurrence prompt also for expanded occurrences of a series and not just for recurrence items; r=philipp
calendar/base/content/calendar-item-editing.js
--- a/calendar/base/content/calendar-item-editing.js
+++ b/calendar/base/content/calendar-item-editing.js
@@ -563,21 +563,16 @@ function promptOccurrenceModification(aI
     let pastItems = [];
     let returnItem = null;
     let type = CANCEL;
     let items = Array.isArray(aItem) ? aItem : [aItem];
 
     // Check if this actually is an instance of a recurring event
     if (items.every(item => item == item.parentItem)) {
         type = MODIFY_PARENT;
-    } else if (items.every(item => item.parentItem.recurrenceInfo.getExceptionFor(item.recurrenceId))) {
-        // If the user wants to edit an occurrence which is already an exception
-        // always edit this single item.
-        // XXX  Why? I think its ok to ask also for exceptions.
-        type = MODIFY_OCCURRENCE;
     } else if (aItem && items.length) {
         // Prompt the user. Setting modal blocks the dialog until it is closed. We
         // use rv to pass our return value.
         let rv = { value: CANCEL, items: items, action: aAction };
         window.openDialog("chrome://calendar/content/calendar-occurrence-prompt.xul",
                           "PromptOccurrenceModification",
                           "centerscreen,chrome,modal,titlebar",
                           rv);