Commit 2d549dcb authored by Rob Stupay's avatar Rob Stupay

cleanup code

parent 89137ba1
...@@ -34,28 +34,34 @@ class MultiParamManager { ...@@ -34,28 +34,34 @@ class MultiParamManager {
switchMethodViewOff () { switchMethodViewOff () {
this.contractActionsContainerSingle.style.display = 'flex' this.contractActionsContainerSingle.style.display = 'flex'
this.contractActionsContainerMulti.style.display = 'none' this.contractActionsContainerMulti.style.display = 'none'
if (this.getMultiValsString()) this.basicInputField.value = this.getMultiValsString() var multiValString = this.getMultiValsString()
if (multiValString) this.basicInputField.value = multiValString
}
getValue (item, index) {
var valStr = item.value.join('')
return valStr
} }
getMultiValsString () { getMultiValsString () {
var valArray = this.multiFields.querySelectorAll('input') var valArray = this.multiFields.querySelectorAll('input')
var notEmpty = 0
var ret = '' var ret = ''
var valArrayTest = []
for (var k = 0; k < valArray.length; k++) {
var elA = valArray[k].value for (var j = 0; j < valArray.length; j++) {
if (elA) notEmpty++ if (ret !== '') ret += ','
var elVal = valArray[j].value
valArrayTest.push(elVal)
elVal = elVal.replace(/(^|,\s+|,)(\d+)(\s+,|,|$)/g, '$1"$2"$3') // replace non quoted number by quoted number
elVal = elVal.replace(/(^|,\s+|,)(0[xX][0-9a-fA-F]+)(\s+,|,|$)/g, '$1"$2"$3') // replace non quoted hex string by quoted hex string
ret += elVal
} }
if (notEmpty) { var valStringTest = valArrayTest.join('')
for (var j = 0; j < valArray.length; j++) { if (valStringTest) {
if (ret !== '') ret += ',' return ret
var elVal = valArray[j].value } else {
elVal = elVal.replace(/(^|,\s+|,)(\d+)(\s+,|,|$)/g, '$1"$2"$3') // replace non quoted number by quoted number return ''
elVal = elVal.replace(/(^|,\s+|,)(0[xX][0-9a-fA-F]+)(\s+,|,|$)/g, '$1"$2"$3') // replace non quoted hex string by quoted hex string
ret += elVal
}
} }
return ret
} }
emptyInputs () { emptyInputs () {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment