diff --git a/src/universal-dapp.js b/src/universal-dapp.js index 8b9d59a13e..53f72b9acb 100644 --- a/src/universal-dapp.js +++ b/src/universal-dapp.js @@ -147,24 +147,19 @@ UniversalDApp.prototype.render = function () { self.$el.append($legend); - // NOTE: this might be used in the future - if (self.contracts.length === 0) { - self.$el.append(self.getABIInputForm()); - } else { - for (var c in self.contracts) { - var $contractEl = $('
'); + for (var c in self.contracts) { + var $contractEl = $(''); - if (self.contracts[c].address) { - self.getInstanceInterface(self.contracts[c], self.contracts[c].address, $contractEl); - } else { - var $title = $('').text(self.contracts[c].name); - if (self.contracts[c].bytecode) { - $title.append($('').text((self.contracts[c].bytecode.length / 2) + ' bytes')); - } - $contractEl.append($title).append(self.getCreateInterface($contractEl, self.contracts[c])); + if (self.contracts[c].address) { + self.getInstanceInterface(self.contracts[c], self.contracts[c].address, $contractEl); + } else { + var $title = $('').text(self.contracts[c].name); + if (self.contracts[c].bytecode) { + $title.append($('').text((self.contracts[c].bytecode.length / 2) + ' bytes')); } - self.$el.append(self.renderOutputModifier(self.contracts[c].name, $contractEl)); + $contractEl.append($title).append(self.getCreateInterface($contractEl, self.contracts[c])); } + self.$el.append(self.renderOutputModifier(self.contracts[c].name, $contractEl)); } return self.$el; @@ -180,31 +175,6 @@ UniversalDApp.prototype.getContractByName = function (contractName) { return null; }; -UniversalDApp.prototype.getABIInputForm = function (cb) { - var self = this; - var $el = $(''); - var $jsonInput = $(''); - var $createButton = $('').text('Render ABI'); - $createButton.click(function (ev) { - var contracts = $.parseJSON($jsonInput.val()); - if (cb) { - var err = null; - var dapp = null; - try { - dapp = new UniversalDApp(contracts, self.options); - } catch (e) { - err = e; - } - cb(err, dapp); - } else { - self.contracts = contracts; - self.$el.empty().append(self.render()); - } - }); - $el.append($jsonInput).append($createButton); - return $el; -}; - UniversalDApp.prototype.getCreateInterface = function ($container, contract) { var self = this; var $createInterface = $(''); @@ -381,6 +351,7 @@ UniversalDApp.prototype.getInstanceInterface = function (contract, address, $tar return $createInterface; }; +// either return the supplied constructor or a mockup (we assume everything can be instantiated) UniversalDApp.prototype.getConstructorInterface = function (abi) { var funABI = { 'name': '', 'inputs': [], 'type': 'constructor', 'outputs': [] }; for (var i = 0; i < abi.length; i++) {