Merge branch 'wip-MDL-61455-33' of https://github.com/marinaglancy/moodle into MOODLE_33_STABLE

lib/amd/src/form-autocomplete.js

@@ -778,6 +778,7 @@ define(['jquery', 'core/log', 'core/str', 'core/templates', 'core/notification']
          * @param {Boolean} caseSensitive - If search has to be made case sensitive.
          * @param {Boolean} showSuggestions - If suggestions should be shown
          * @param {String} noSelectionString - Text to display when there is no selection
+         * @return {Promise}
          */
         enhance: function(selector, tags, ajax, placeholder, caseSensitive, showSuggestions, noSelectionString) {
             // Set some default values.
@@ -815,7 +816,7 @@ define(['jquery', 'core/log', 'core/str', 'core/templates', 'core/notification']
             if (!originalSelect) {
                 log.debug('Selector not found: ' + selector);
                 M.util.js_complete(pendingKey);
-                return;
+                return false;
             }
 
             // Hide the original select.
@@ -851,7 +852,7 @@ define(['jquery', 'core/log', 'core/str', 'core/templates', 'core/notification']
             var renderDatalist = templates.render('core/form_autocomplete_suggestions', context);
             var renderSelection = templates.render('core/form_autocomplete_selection', context);
 
-            $.when(renderInput, renderDatalist, renderSelection).done(function(input, suggestions, selection) {
+            return $.when(renderInput, renderDatalist, renderSelection).then(function(input, suggestions, selection) {
                 // Add our new UI elements to the page.
                 originalSelect.after(suggestions);
                 originalSelect.after(input);

theme/boost/scss/moodle/undo.scss

@@ -138,3 +138,12 @@ ol {
     max-height: calc(100vh - #{$navbar-height});
     overflow-y: auto;
 }
+
+// Dont allow z-index creep anywhere.
+.page-item {
+    &.active .page-link {
+        @include plain-hover-focus {
+            z-index: inherit;
+        }
+    }
+}