FIX Validation error behaviour

silverstripe · Dec 9, 2024 · afb98b1 · afb98b1
1 parent 4d864c0
commit afb98b1
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/client/dist/js/bundle.js b/client/dist/js/bundle.js
diff --git a/client/src/legacy/LeftAndMain.js b/client/src/legacy/LeftAndMain.js
@@ -471,7 +471,7 @@ $.entwine('ss', function($) {
               '<span class="btn__circle btn__circle--1"></span>' +
               '<span class="btn__circle btn__circle--2"></span>' +
               '<span class="btn__circle btn__circle--3"></span>' +
-              "</div>"
+              '</div>'
           )
         );
 
@@ -488,6 +488,14 @@ $.entwine('ss', function($) {
       };
       form.trigger('beforesubmitform', beforeSubmitFormEventData);
 
+      var clearButton = function() {
+        $(button).removeClass('btn--loading loading');
+        $(button).prop('disabled', false);
+        $(button).find('.btn__loading-icon').remove();
+        $(button).css('width', 'auto');
+        $(button).text($(button).data('original-text'));
+      }
+
       Promise.all(beforeSubmitFormEventData.promises).then(function(results) {
 
         let success = true;
@@ -526,14 +534,6 @@ $.entwine('ss', function($) {
         // validate if required
         var validationResult = form.validate();
 
-        var clearButton = function() {
-          $(button).removeClass('btn--loading loading');
-          $(button).prop('disabled', false);
-          $(button).find('.btn__loading-icon').remove();
-          $(button).css('width', 'auto');
-          $(button).text($(button).data('original-text'));
-        }
-
         if(typeof validationResult!=='undefined' && !validationResult) {
           statusMessage("Validation failed.", "bad");
           clearButton();