Merge branch 'MDL-57488-master' of git://github.com/danpoltawski/moodle

This commit is contained in:
Eloy Lafuente (stronk7) 2017-01-18 00:00:13 +01:00
commit d7cee87d24
4 changed files with 26 additions and 42 deletions

View file

@ -216,20 +216,21 @@
</div>
{{/hasinstructions}}
{{#js}}
require(['jquery', 'core/yui'], function($, Y) {
{{#error}}
$(function() {
M.util.focus_login_error(Y);
require(['jquery'], function($) {
$('#loginerrormessage').focus();
});
{{/error}}
{{^error}}
{{#autofocusform}}
$(function() {
M.util.focus_login_form(Y);
require(['jquery'], function($) {
if ($('#username').val()) {
$('#password').focus();
} else {
$('#username').focus();
}
});
{{/autofocusform}}
{{/error}}
})
{{/js}}