From 77f47af5cba379a7275dab3ef534a8026d163c57 Mon Sep 17 00:00:00 2001
From: pjayme <pjayme@silverstripe.com>
Date: Mon, 25 Jun 2018 11:31:46 +1200
Subject: [PATCH] Added JS fix for reply forms - fixes issue where the submit
 button breaks due to incorrect use of the jQuery validate function

---
 javascript/CommentsInterface.js | 44 +++++++++++++++++----------------
 1 file changed, 23 insertions(+), 21 deletions(-)

diff --git a/javascript/CommentsInterface.js b/javascript/CommentsInterface.js
index 23812f7..231266c 100755
--- a/javascript/CommentsInterface.js
+++ b/javascript/CommentsInterface.js
@@ -6,31 +6,33 @@
 		/**
 		 * Enable form validation
 		 */
-		$('.comments-holder-container form').validate({
+        $('.comments-holder-container form').each(function() {
+            $(this).validate({
 
-			// Ignore hidden elements in this form
-			ignore: ':hidden',
+                // Ignore hidden elements in this form
+                ignore: ':hidden',
 
-			// Use default 'required' for error labels
-			errorClass: "required",
+                // Use default 'required' for error labels
+                errorClass: "required",
 
-			// Use span instead of labels
-			errorElement: "span",
+                // Use span instead of labels
+                errorElement: "span",
 
-			// On error, scroll to the invalid element
-			invalidHandler : function(form, validator){
-				$('html, body').animate({
-					scrollTop: $(validator.errorList[0].element).offset().top - 30
-				}, 200);
-			},
+                // On error, scroll to the invalid element
+                invalidHandler : function(form, validator){
+                    $('html, body').animate({
+                        scrollTop: $(validator.errorList[0].element).offset().top - 30
+                    }, 200);
+                },
 
-			// Ensure any new error message has the correct class and placement
-			errorPlacement: function(error, element) {
-				error
-					.addClass('message')
-					.insertAfter(element);
-			}
-		});
+                // Ensure any new error message has the correct class and placement
+                errorPlacement: function(error, element) {
+                    error
+                        .addClass('message')
+                        .insertAfter(element);
+                }
+            });
+        });
 
 		/**
 		 * Hide comment reply forms by default (unless visiting via permalink)
@@ -56,7 +58,7 @@
 
 			// Prevent focus
 			e.preventDefault();
-			
+
 			if(form.is(':visible')) {
 				allForms.slideUp();
 			} else {