Merge branch 'MDL-59670-master' of git://github.com/andrewnicols/moodle

moodle · Aug 28, 2017 · cace548 · cace548
2 parents 9317cee + a49c3d8
commit cace548
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/calendar/amd/build/event_form.min.js b/calendar/amd/build/event_form.min.js
diff --git 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 {