Fix issue where submit button would remain disabled after errors on f…

…rontend
SamuelNitsche · Aug 14, 2016 · b78aa6f · b78aa6f
1 parent 83d9cba
commit b78aa6f
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 12 deletions.
diff --git a/public/assets/javascript/app-public.js b/public/assets/javascript/app-public.js
@@ -32,6 +32,7 @@ $(function() {
                    Please try again, or contact the webmaster if the problem persists.');
                     },
                     success: function(data, statusText, xhr, $form) {
+                        var $submitButton = $form.find('input[type=submit]');
 
                         if (data.message) {
                             showMessage(data.message);
@@ -46,9 +47,6 @@ $(function() {
                                         document.location.href = data.redirectUrl;
                                     }
                                 }
-
-                                var $submitButton = $form.find('input[type=submit]');
-                                toggleSubmitDisabled($submitButton);
                                 break;
 
                             case 'error':
@@ -60,7 +58,13 @@ $(function() {
 
                             default:
                                 break;
+
+
                         }
+
+                        toggleSubmitDisabled($submitButton);
+
+
                     },
                     dataType: 'json'
                 };
@@ -200,7 +204,7 @@ function processFormErrors($form, errors)
 }
 
 /**
- * Toggle a submit button disabled/enabled - duh!
+ * Toggle a submit button disabled/enabled
  *
  * @param element $submitButton
  * @returns void

diff --git a/public/assets/javascript/backend.js b/public/assets/javascript/backend.js
@@ -9053,8 +9053,7 @@ $.cf = {
                 return;
             }
 
-            showMessage('Whoops!, it looks like something went wrong on our servers.\n\
-                   Please try again, or contact support if the problem persists.');
+            showMessage('Whoops!, it looks like the server returned an error.');
 
             var $submitButton = $form.find('input[type=submit]');
             toggleSubmitDisabled($submitButton);

diff --git a/public/assets/javascript/frontend.js b/public/assets/javascript/frontend.js
@@ -4596,11 +4596,12 @@ function log() {
                         }
 
                         toggleSubmitDisabled($submitButton);
-                        showMessage('Whoops!, it looks like something went wrong on our servers.\n\
-                   Please try again, or contact support if the problem persists.');
+                        showMessage('Whoops!, it looks like the server returned an error.\n\
+                   Please try again, or contact the webmaster if the problem persists.');
                     },
                     success: function(data, statusText, xhr, $form) {
-
+                        var $submitButton = $form.find('input[type=submit]');
+
                         if (data.message) {
                             showMessage(data.message);
                         }
@@ -4614,9 +4615,6 @@ function log() {
                                         document.location.href = data.redirectUrl;
                                     }
                                 }
-
-                                var $submitButton = $form.find('input[type=submit]');
-                                toggleSubmitDisabled($submitButton);
                                 break;
 
                             case 'error':
@@ -4628,7 +4626,13 @@ function log() {
 
                             default:
                                 break;
+
+
                         }
+
+                        toggleSubmitDisabled($submitButton);
+
+
                     },
                     dataType: 'json'
                 };