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

Replaced JS string concatenation with rawJS

Browse Source
This commit is contained in:
Burtannia 2020-11-20 02:47:19 +00:00
parent 91c1a7fac7
commit f2d3f3d8da
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -288,7 +288,7 @@ mhelperMulti field@Field {..} fs@FieldSettings {..} wrapperClass defs minVals Mu
let delFunction = toWidget let delFunction = toWidget
[julius| [julius|
function deleteField_#{rawJS theId}(wrapper) { function deleteField_#{rawJS theId}(wrapper) {
var numFields = $("." + #{wrapperClass}).length; var numFields = $('.#{rawJS wrapperClass}').length;
if (numFields == 1) if (numFields == 1)
{ {
@ -326,9 +326,9 @@ mhelperMulti field@Field {..} fs@FieldSettings {..} wrapperClass defs minVals Mu
|] |]
toWidget toWidget
[julius| [julius|
$("#" + #{delBtnId}).click(function() { $('##{rawJS delBtnId}').click(function() {
var field = $("#" + #{fieldId}); var field = $('##{rawJS fieldId}');
deleteField_#{rawJS theId}(field.parents("." + #{wrapperClass})); deleteField_#{rawJS theId}(field.parents('.#{rawJS wrapperClass}'));
}); });
|] |]
@ -382,7 +382,7 @@ mhelperMulti field@Field {..} fs@FieldSettings {..} wrapperClass defs minVals Mu
toWidget toWidget
[julius| [julius|
var extraFields_#{rawJS theId} = 0; var extraFields_#{rawJS theId} = 0;
$("#" + #{addBtnId}).click(function() { $('##{rawJS addBtnId}').click(function() {
extraFields_#{rawJS theId}++; extraFields_#{rawJS theId}++;
var newNumber = parseInt(#{show counter}) + extraFields_#{rawJS theId}; var newNumber = parseInt(#{show counter}) + extraFields_#{rawJS theId};
$("#" + #{cid}).val(newNumber); $("#" + #{cid}).val(newNumber);
@ -391,8 +391,8 @@ mhelperMulti field@Field {..} fs@FieldSettings {..} wrapperClass defs minVals Mu
var newDelId = #{delBtnPrefix} + newId; var newDelId = #{delBtnPrefix} + newId;
// get new wrapper and remove old error messages // get new wrapper and remove old error messages
var newWrapper = $("." + #{wrapperClass}).first().clone(); var newWrapper = $('.#{rawJS wrapperClass}').first().clone();
newWrapper.children( ":not(." + #{wrapperClass} + "-inner)" ).remove(); newWrapper.children( ':not(.#{rawJS wrapperClass}-inner)' ).remove();
// get counter from wrapper // get counter from wrapper
var oldCount = newWrapper.data("counter"); var oldCount = newWrapper.data("counter");
@ -424,11 +424,11 @@ mhelperMulti field@Field {..} fs@FieldSettings {..} wrapperClass defs minVals Mu
// set new counter on wrapper // set new counter on wrapper
newWrapper.attr("data-counter", newNumber); newWrapper.attr("data-counter", newNumber);
var newDelBtn = newWrapper.find("[id^=" + #{delBtnPrefix} + "]"); var newDelBtn = newWrapper.find('[id^=#{rawJS delBtnPrefix}]');
newDelBtn.prop('id', newDelId); newDelBtn.prop('id', newDelId);
newDelBtn.click(() => deleteField_#{rawJS theId}(newWrapper)); newDelBtn.click(() => deleteField_#{rawJS theId}(newWrapper));
newWrapper.insertBefore("#" + #{addBtnId}); newWrapper.insertBefore('##{rawJS addBtnId}');
}); });
|] |]