diff --git a/js/9.7/parseForm.js b/js/9.7/parseForm.js index e9552a1..2f77141 100644 --- a/js/9.7/parseForm.js +++ b/js/9.7/parseForm.js @@ -102,40 +102,11 @@ function parseFormOnSubmit(returnJSON = false, parseOnly = false) { obj.result = value; } - if (conListFlag) { - if (obj.type == "conList") { - //check for button if only one item exists and search conlist item - if (obj.listCount == 0) { - for (let d of dataArray) { - if (d.name.split(":!")[1] !== undefined) d.placeholder = "!"+d.name.split(":!")[1]; - d.name = d.name.split(":!")[0]; - if ("cl-"+obj[0].replace(/ /g, "_") == d.name && d.value != "") { - //console.log(d, obj[0], data); - if (data.value.replace(/ /g, "_") == d.name.substring(3)) { - if (d.hasOwnProperty("placeholder")) d.value = d.placeholder + "\n" + d.value; - let value = parseDataForResult(obj, d.value); - obj.result = obj.result + "\n" + value; - } - } - } - } else { - //loop through dataArray and look for coresponding conlist items - for (let i = 0; i <= obj.listCount; i++) { - for (let d of dataArray) { - if (d.name.split(":!")[1] !== undefined) d.placeholder = "!"+d.name.split(":!")[1]; - d.name = d.name.split(":!")[0]; - if ("cl-"+obj[i].replace(/ /g, "_") == d.name && d.value != "") { - if (data.value.replace(/ /g, "_") == d.name.substring(3)) { - if (d.hasOwnProperty("placeholder")) d.value = d.placeholder + "\n" + d.value; - let value = parseDataForResult(obj, d.value); - obj.result = obj.result + "\n" + value; - } - } - } - } - } - } + //handle conlist elements for parsing each element + if (conListFlag && obj.type == "conList") { + let value = parseConListForResult(obj, data, dataArray); + obj.result = value; } } } @@ -214,6 +185,39 @@ function parseFormOnSubmit(returnJSON = false, parseOnly = false) { return value; } + function parseConListForResult(obj, data, dataArray) { + //check for button if only one item exists and search conlist item + if (obj.listCount == 0) { + for (let d of dataArray) { + if (d.name.split(":!")[1] !== undefined) d.placeholder = "!"+d.name.split(":!")[1]; + d.name = d.name.split(":!")[0]; + if ("cl-"+obj[0].replace(/ /g, "_") == d.name && d.value != "") { + //console.log(d, obj[0], data); + if (data.value.replace(/ /g, "_") == d.name.substring(3)) { + if (d.hasOwnProperty("placeholder")) d.value = d.placeholder + "\n" + d.value; + let value = parseDataForResult(obj, d.value); + return obj.result + "\n" + value; + } + } + } + } else { + //loop through dataArray and look for coresponding conlist items + for (let i = 0; i <= obj.listCount; i++) { + for (let d of dataArray) { + if (d.name.split(":!")[1] !== undefined) d.placeholder = "!"+d.name.split(":!")[1]; + d.name = d.name.split(":!")[0]; + if ("cl-"+obj[i].replace(/ /g, "_") == d.name && d.value != "") { + if (data.value.replace(/ /g, "_") == d.name.substring(3)) { + if (d.hasOwnProperty("placeholder")) d.value = d.placeholder + "\n" + d.value; + let value = parseDataForResult(obj, d.value); + return obj.result + "\n" + value; + } + } + } + } + } + } + export function parseTextMarkups(data) { let dataArray = data.split("\n"); let listFlag = false;