fix call to logCallback

pull/3094/head
Iuri Matias 6 years ago committed by yann300
parent 5d1dabacce
commit 06c5985772
  1. 2
      src/app.js
  2. 15
      src/universal-dapp-ui.js
  3. 1
      src/universal-dapp.js

@ -320,7 +320,7 @@ Please make a backup of your contracts and start using http://remix.ethereum.org
if (txLink) registry.get('logCallback').api.logCallback(yo`<a href="${txLink}" target="_blank">${txLink}</a>`) if (txLink) registry.get('logCallback').api.logCallback(yo`<a href="${txLink}" target="_blank">${txLink}</a>`)
}) })
var udappUI = new UniversalDAppUI(udapp) var udappUI = new UniversalDAppUI(udapp, registry)
registry.put({api: udappUI, name: 'udappUI'}) registry.put({api: udappUI, name: 'udappUI'})
// ----------------- Tx listener ----------------- // ----------------- Tx listener -----------------

@ -21,8 +21,9 @@ var modalCustom = require('./app/ui/modal-dialog-custom')
var modalDialog = require('./app/ui/modaldialog') var modalDialog = require('./app/ui/modaldialog')
var TreeView = require('./app/ui/TreeView') var TreeView = require('./app/ui/TreeView')
function UniversalDAppUI (udapp, opts = {}) { function UniversalDAppUI (udapp, registry) {
this.udapp = udapp this.udapp = udapp
this.registry = registry
} }
function decodeResponseToTreeView (response, fnabi) { function decodeResponseToTreeView (response, fnabi) {
@ -217,9 +218,9 @@ UniversalDAppUI.prototype.getCallButton = function (args) {
txFormat.buildData(args.contractName, args.contractAbi, self.udapp.data.contractsDetails, false, args.funABI, args.funABI.type !== 'fallback' ? value : '', (error, data) => { txFormat.buildData(args.contractName, args.contractAbi, self.udapp.data.contractsDetails, false, args.funABI, args.funABI.type !== 'fallback' ? value : '', (error, data) => {
if (!error) { if (!error) {
if (!args.funABI.constant) { if (!args.funABI.constant) {
self.udapp._deps.logCallback(`${logMsg} pending ... `) self.registry.logCallback(`${logMsg} pending ... `)
} else { } else {
self.udapp._deps.logCallback(`${logMsg}`) self.registry.logCallback(`${logMsg}`)
} }
if (args.funABI.type === 'fallback') data.dataHex = value if (args.funABI.type === 'fallback') data.dataHex = value
self.udapp.callFunction(args.address, data, args.funABI, confirmationCb, continueCb, promptCb, (error, txResult) => { self.udapp.callFunction(args.address, data, args.funABI, confirmationCb, continueCb, promptCb, (error, txResult) => {
@ -228,7 +229,7 @@ UniversalDAppUI.prototype.getCallButton = function (args) {
if (isVM) { if (isVM) {
var vmError = txExecution.checkVMError(txResult) var vmError = txExecution.checkVMError(txResult)
if (vmError.error) { if (vmError.error) {
self.udapp._deps.logCallback(`${logMsg} errored: ${vmError.message} `) self.registry.logCallback(`${logMsg} errored: ${vmError.message} `)
return return
} }
} }
@ -237,14 +238,14 @@ UniversalDAppUI.prototype.getCallButton = function (args) {
outputCb(decoded) outputCb(decoded)
} }
} else { } else {
self.udapp._deps.logCallback(`${logMsg} errored: ${error} `) self.registry.logCallback(`${logMsg} errored: ${error} `)
} }
}) })
} else { } else {
self.udapp._deps.logCallback(`${logMsg} errored: ${error} `) self.registry.logCallback(`${logMsg} errored: ${error} `)
} }
}, (msg) => { }, (msg) => {
self.udapp._deps.logCallback(msg) self.registry.logCallback(msg)
}, (data, runTxCallback) => { }, (data, runTxCallback) => {
// called for libraries deployment // called for libraries deployment
self.udapp.runTx(data, confirmationCb, runTxCallback) self.udapp.runTx(data, confirmationCb, runTxCallback)

@ -10,7 +10,6 @@ var executionContext = remixLib.execution.executionContext
function UniversalDApp (globalRegistry) { function UniversalDApp (globalRegistry) {
this.event = new EventManager() this.event = new EventManager()
this.data = {}
this._deps = { this._deps = {
config: globalRegistry.get('config').api, config: globalRegistry.get('config').api,
compiler: globalRegistry.get('compiler').api compiler: globalRegistry.get('compiler').api

Loading…
Cancel
Save