Merge branch 'MDL-73074-311' of https://github.com/paulholden/moodle into MOODLE_311_STABLE

2021-11-29 23:15:03 +01:00
parent 66c48b3358 3de2b5527f
commit fa8cf48660
3 changed files with 10 additions and 4 deletions
@@ -1098,10 +1098,16 @@ function($, log, str, templates, notification, LoadingIcon, Aria) {
                return false;
            }

-            Aria.hide(originalSelect.get());
-            originalSelect.css('visibility', 'hidden');
+            // Ensure we enhance the element only once.
+            if (originalSelect.data('enhanced') === 'enhanced') {
+                M.util.js_complete(pendingKey);
+                return false;
+            }
+            originalSelect.data('enhanced', 'enhanced');

            // Hide the original select.
+            Aria.hide(originalSelect.get());
+            originalSelect.css('visibility', 'hidden');

            // Find or generate some ids.
            var state = {