MDL-59670 calendar: Select correct group when editing events

diff --git a/calendar/amd/build/event_form.min.js b/calendar/amd/build/event_form.min.js
index 49c3a88..d90e7c8 100644 (file)
Binary files a/calendar/amd/build/event_form.min.js and b/calendar/amd/build/event_form.min.js differ

diff --git a/calendar/amd/src/event_form.js b/calendar/amd/src/event_form.js
index 0a4e33e..e6abfd8 100644 (file)
--- a/calendar/amd/src/event_form.js
+++ b/calendar/amd/src/event_form.js
@@ -232,7 +232,7 @@ define(['jquery', 'core/templates'], function($, Templates) {
                     element.removeClass('hidden');
                     element.prop('disabled', false);
 
-                    if (selectedIndex === null) {
+                    if (selectedIndex === null || element.attr('selected')) {
                         selectedIndex = index;
                     }
                 } else {