haskell/yesod
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor refactoring

Browse Source
This commit is contained in:
James Burton 2020-11-15 22:19:37 +00:00
parent 008b4af741
commit 973461e70f
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
yesod-form-multi/Yesod/Form/MultiInput.hs
View File

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