Merge pull request #25 from NHSLeadership/develop

Develop

composer.json

@@ -1,7 +1,7 @@
 {
     "name": "nhsla/moodle-nhse",
     "type": "moodle-theme",
-    "version": "2023051701",
+    "version": "2023052302",
     "require": {
         "composer/installers": "~1.0"
     },

templates/core/loginform.mustache

@@ -324,21 +324,19 @@
     </div>
 </div>
 {{#js}}
-    {{#error}}
-        require(['jquery'], function($) {
-        $('#loginerrormessage').focus();
-        });
-    {{/error}}
     {{^error}}
         {{#autofocusform}}
-            require(['jquery'], function($) {
-            if ($('#username').val()) {
-            $('#password').focus();
+            var userNameField = document.getElementById('username');
+            if (userNameField.value.length == 0) {
+            userNameField.focus();
             } else {
-            $('#username').focus();
+            document.getElementById('password').focus();
             }
-            });
         {{/autofocusform}}
     {{/error}}
+    {{#error}}
+        document.getElementById('loginerrormessage').focus();
+    {{/error}}
 {{/js}}
 
+

version.php

@@ -26,7 +26,7 @@
 defined('MOODLE_INTERNAL') || die();
 
 // This is the version of the plugin.
-$plugin->version = 2023051801;
+$plugin->version = 2023052302;
 $plugin->release = '401.0.1';
 $plugin->maturity = MATURITY_BETA;