From 973461e70f74bd3600ad983af241b413290f8ca1 Mon Sep 17 00:00:00 2001
From: James Burton <burtannia1997@gmail.com>
Date: Sun, 15 Nov 2020 22:19:37 +0000
Subject: [PATCH] Minor refactoring

---
 yesod-form-multi/Yesod/Form/MultiInput.hs | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/yesod-form-multi/Yesod/Form/MultiInput.hs b/yesod-form-multi/Yesod/Form/MultiInput.hs
index 1afde113..7dcc9e67 100644
--- a/yesod-form-multi/Yesod/Form/MultiInput.hs
+++ b/yesod-form-multi/Yesod/Form/MultiInput.hs
@@ -292,7 +292,7 @@ mhelperMulti field@Field {..} fs@FieldSettings {..} wrapperClass defs minVals Mu
                 }
             |]
 
-        mkDelBtn fieldId wrapperClass = do
+        mkDelBtn fieldId = do
             let delBtnId = delBtnPrefix <> fieldId
             [whamlet|
                 <button ##{delBtnId} .#{msDelClass} style="margin-left: 0.75rem" type="button">
@@ -312,8 +312,8 @@ mhelperMulti field@Field {..} fs@FieldSettings {..} wrapperClass defs minVals Mu
     -- generate field views
     (rs, fvs) <- do
         let mkView' ((c, (n,i)), r@(res, _)) = do
-                let del = Just (mkDelBtn i wrapperClass, wrapperClass, c)
-                fv <- mkView field fs r del msErrWidget msWrapperErrClass i n False
+                let del = Just (mkDelBtn i, wrapperClass, c)
+                fv <- mkView field fs r del msErrWidget msWrapperErrClass i n True
                 return (res, fv)
             xs = zip (mkNames counter) results
             notSuccNothing (_, (r,_)) = not $ isSuccNothing r
@@ -399,10 +399,7 @@ mhelperMulti field@Field {..} fs@FieldSettings {..} wrapperClass defs minVals Mu
                         });
 
                         // set new counter on wrapper
-                        newWrapper.data("counter", newNumber);
-
-                        //var newField = newWrapper.find("[id^=" + #{theId} + "]"); 
-                        //newField.val("").attr('name', newName).attr('id', newId);
+                        newWrapper.attr("data-counter", newNumber);
 
                         var newDelBtn = newWrapper.find("[id^=" + #{delBtnPrefix} + "]");
                         newDelBtn.prop('id', newDelId);