Commit 57a2188c authored by Eloy Lafuente's avatar Eloy Lafuente
Browse files

Merge branch 'MDL-69092-patched' of https://github.com/ilyatregubov/moodle

parents e14bb0b9 47c92894
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
...@@ -299,6 +299,9 @@ define(['jquery', 'core/ajax', 'core/paged_content_factory', 'core/notification' ...@@ -299,6 +299,9 @@ define(['jquery', 'core/ajax', 'core/paged_content_factory', 'core/notification'
* @private * @private
*/ */
var reloadToolList = function() { var reloadToolList = function() {
// Behat tests should wait for the tool list to load.
M.util.js_pending('reloadToolList');
const cardContainer = getToolCardContainer(); const cardContainer = getToolCardContainer();
const listContainer = getToolListContainer(); const listContainer = getToolListContainer();
const limit = 60; const limit = 60;
...@@ -322,7 +325,10 @@ define(['jquery', 'core/ajax', 'core/paged_content_factory', 'core/notification' ...@@ -322,7 +325,10 @@ define(['jquery', 'core/ajax', 'core/paged_content_factory', 'core/notification'
// Add the paged content into the page. // Add the paged content into the page.
templates.replaceNodeContents(cardContainer, html, js); templates.replaceNodeContents(cardContainer, html, js);
}) })
.always(stopLoading(listContainer)); .always(function() {
stopLoading(listContainer);
M.util.js_complete('reloadToolList');
});
}); });
startLoading(listContainer); startLoading(listContainer);
}; };
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment