update for browser tests feedback

pull/3094/head
Rob Stupay 7 years ago committed by yann300
parent 0fa95b311f
commit 3e7ddaa85e
  1. 2
      package.json
  2. 9
      src/multiParamManager.js
  3. 5
      src/universal-dapp-ui.js

@ -171,7 +171,7 @@
"sourcemap": "exorcist --root ../ build/app.js.map > build/app.js", "sourcemap": "exorcist --root ../ build/app.js.map > build/app.js",
"start": "npm-run-all -lpr serve watch onchange remixd", "start": "npm-run-all -lpr serve watch onchange remixd",
"test": "npm run csslint; standard && node test/index.js", "test": "npm run csslint; standard && node test/index.js",
"test-browser": "npm-run-all -lpr selenium downloadsolc make-mock-compiler serve browsertest", "test-browser": "npm-run-all -lpr selenium downloadsolc_root make-mock-compiler serve browsertest",
"watch": "watchify src/index.js -dv -p browserify-reload -o build/app.js" "watch": "watchify src/index.js -dv -p browserify-reload -o build/app.js"
} }
} }

@ -54,12 +54,15 @@ class MultiParamManager {
var basicInputField = yo`<input></input>` var basicInputField = yo`<input></input>`
basicInputField.setAttribute('placeholder', this.inputs) basicInputField.setAttribute('placeholder', this.inputs)
basicInputField.setAttribute('title', '') basicInputField.setAttribute('title', this.inputs)
var onClick = () => { // var outputOverride = 'yellow'
var onClick = (domEl) => {
this.clickCallBack(this.funABI.inputs, basicInputField.value) this.clickCallBack(this.funABI.inputs, basicInputField.value)
} }
// this.outputOverride = yo`<div class=${css.value}></div>` // show return value
this.contractActionsContainerSingle = yo`<div class="${css.contractActionsContainerSingle}" > this.contractActionsContainerSingle = yo`<div class="${css.contractActionsContainerSingle}" >
<i class="fa fa-caret-right ${css.methCaret}" onclick=${() => { this.switchMethodViewOn() }} title=${title} ></i> <i class="fa fa-caret-right ${css.methCaret}" onclick=${() => { this.switchMethodViewOn() }} title=${title} ></i>
<button onclick=${() => { onClick() }} class="${css.instanceButton}">${title}</button>${basicInputField} <button onclick=${() => { onClick() }} class="${css.instanceButton}">${title}</button>${basicInputField}
@ -110,10 +113,12 @@ class MultiParamManager {
if (this.funABI.payable === true) { if (this.funABI.payable === true) {
contractProperty.classList.add(css.payable) contractProperty.classList.add(css.payable)
button.setAttribute('title', (title + ' - transact (payable)')) button.setAttribute('title', (title + ' - transact (payable)'))
this.contractActionsContainerSingle.querySelector('button').setAttribute('title', (title + ' - transact (payable)'))
} }
if (!this.lookupOnly && this.funABI.payable === false) { if (!this.lookupOnly && this.funABI.payable === false) {
button.setAttribute('title', (title + ' - transact (not payable)')) button.setAttribute('title', (title + ' - transact (not payable)'))
this.contractActionsContainerSingle.querySelector('button').setAttribute('title', (title + ' - transact (not payable)'))
} }
return contractProperty return contractProperty

@ -101,11 +101,12 @@ UniversalDAppUI.prototype.getCallButton = function (args) {
}) })
} }
var multiParamManager = new MultiParamManager(lookupOnly, args.funABI, (valArray, inputsValues) => { var multiParamManager = new MultiParamManager(lookupOnly, args.funABI, (valArray, inputsValues, domEl) => {
clickButton(valArray, inputsValues) clickButton(valArray, inputsValues, domEl)
}, self.udapp.getInputs(args.funABI)) }, self.udapp.getInputs(args.funABI))
var contractActionsContainer = yo`<div class="${css.contractActionsContainer}" >${multiParamManager.render()}</div>` var contractActionsContainer = yo`<div class="${css.contractActionsContainer}" >${multiParamManager.render()}</div>`
contractActionsContainer.appendChild(outputOverride)
return contractActionsContainer return contractActionsContainer
} }

Loading…
Cancel
Save