From c828d0164a43c169775ae107be3fd4409d6c3ecb Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Thu, 23 Mar 2017 10:43:11 +0100
Subject: fix: keep ticket submit button clickable

It was marked as submitted even when client side validations interfered.

fixes github issue #227
---
 app/assets/javascripts/buttons.js | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

(limited to 'app')

diff --git a/app/assets/javascripts/buttons.js b/app/assets/javascripts/buttons.js
index 7142957..aaa9911 100644
--- a/app/assets/javascripts/buttons.js
+++ b/app/assets/javascripts/buttons.js
@@ -5,12 +5,12 @@
  *
  * Some form inputs are validaded before the submission
  * so triggering loading state on click events is not a
- * good idea. If the validation fails the errors will 
+ * good idea. If the validation fails the errors will
  * be displayed but the button would be in loading state.
  *
  * We used to trigger it based on form submission but
  * we have a few forms that contain multiple buttons.
- * So now we mark the buttons as clicked on click and 
+ * So now we mark the buttons as clicked on click and
  * put the clicked button into loading state on submit.
  *
  */
@@ -26,14 +26,19 @@
 
   markAsLoading = function(submitEvent) {
     var form = submitEvent.target;
-    $(form).addClass('submitted')
-    // bootstrap loading state:
-    $(form).find('.btn.clicked[type="submit"]').button('loading');
+    var validations = form.ClientSideValidations
+
+    if ( ( typeof validations === 'undefined' ) ||
+         $(form).isValid(validations.settings.validators) ) {
+      $(form).addClass('submitted')
+      // bootstrap loading state:
+      $(form).find('.btn.clicked[type="submit"]').button('loading');
+    }
   };
 
   $(document).ready(function() {
     $('form').submit(markAsLoading);
     $('.btn[type="submit"]').click(markAsClicked);
   });
-  
+
 }).call(this);
-- 
cgit v1.2.3