From 56ec35eae5df613aae570fc4289d87b0fb38f8da Mon Sep 17 00:00:00 2001
From: Aleksander Budzynowski <998324+aleksb@users.noreply.github.com>
Date: Tue, 11 Sep 2018 10:00:25 +1000
Subject: [PATCH] Issue #409 - fix bugs in stripValidation()

---
 app/assets/javascripts/fae/form/_validator.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/assets/javascripts/fae/form/_validator.js b/app/assets/javascripts/fae/form/_validator.js
index 29a1687b2..e2152b53c 100644
--- a/app/assets/javascripts/fae/form/_validator.js
+++ b/app/assets/javascripts/fae/form/_validator.js
@@ -268,12 +268,13 @@ Fae.form.validator = {
       // if the kind matches, remove it from the array
       if (validations[i]['kind'] === kind) {
         validations.splice(i, 1);
+        i--;
+      } else {
+        // otherwise convert JSON back to a string
+        validations[i] = JSON.stringify(validations[i]);
       }
-
-      // convert JSON back to a string
-      validations[i] = JSON.stringify(validations[i]);
     }
-    $field.attr('data-validate', '[' + validations + ']');
+    $field.data('validate', '[' + validations + ']');
   },
 
   /**