Commit 3a7a3144 authored by chriseth's avatar chriseth Committed by GitHub

Merge pull request #299 from ethereum/contract-details

Contract details
parents 21d1a5db 3fde2d62
...@@ -349,13 +349,6 @@ body { ...@@ -349,13 +349,6 @@ body {
margin: 0.5em; margin: 0.5em;
} }
.gethDeployText {
border-color: #bebebe;
height: 2.5em;
width: 100%;
display: block;
}
.contractDetails button { .contractDetails button {
background-color: transparent; background-color: transparent;
border: 0 none; border: 0 none;
......
...@@ -85,27 +85,22 @@ Renderer.prototype.contracts = function (data, source) { ...@@ -85,27 +85,22 @@ Renderer.prototype.contracts = function (data, source) {
}) })
} }
// rendering function used by udapp. they need data and source
var combined = function (contractName, jsonInterface, bytecode) {
return JSON.stringify([{ name: contractName, interface: jsonInterface, bytecode: bytecode }])
}
var renderOutputModifier = function (contractName, $contractOutput) { var renderOutputModifier = function (contractName, $contractOutput) {
var contract = data.contracts[contractName] var contract = data.contracts[contractName]
if (contract.bytecode) { if (contract.bytecode) {
$contractOutput.append(uiHelper.textRow('Bytecode', contract.bytecode)) $contractOutput.append(uiHelper.tableRow('Bytecode', contract.bytecode))
} }
$contractOutput.append(uiHelper.textRow('Interface', contract['interface'])) $contractOutput.append(uiHelper.tableRow('Interface', contract['interface']))
if (contract.bytecode) { if (contract.bytecode) {
$contractOutput.append(uiHelper.textRow('Web3 deploy', uiHelper.gethDeploy(contractName.toLowerCase(), contract['interface'], contract.bytecode), 'deploy')) $contractOutput.append(uiHelper.preRow('Web3 deploy', uiHelper.gethDeploy(contractName.toLowerCase(), contract['interface'], contract.bytecode), 'deploy'))
$contractOutput.append(uiHelper.textRow('uDApp', combined(contractName, contract['interface'], contract.bytecode), 'deploy'))
} }
var ctrSource = getSource(contractName, source, data) var ctrSource = getSource(contractName, source, data)
return $contractOutput.append(uiHelper.getDetails(contract, ctrSource, contractName)) return $contractOutput.append(uiHelper.getDetails(contract, ctrSource, contractName))
} }
// //
var self = this var self = this
var getSource = function (contractName, source, data) { var getSource = function (contractName, source, data) {
......
...@@ -16,13 +16,6 @@ module.exports = { ...@@ -16,13 +16,6 @@ module.exports = {
$('<input readonly="readonly"/>').val(data)) $('<input readonly="readonly"/>').val(data))
}, },
textRow: function (description, data, cls) {
return this.tableRowItems(
$('<strong/>').text(description),
$('<textarea readonly="readonly" class="gethDeployText"/>').val(data),
cls)
},
preRow: function (description, data) { preRow: function (description, data) {
return this.tableRowItems( return this.tableRowItems(
$('<span/>').text(description), $('<span/>').text(description),
...@@ -141,7 +134,9 @@ module.exports = { ...@@ -141,7 +134,9 @@ module.exports = {
for (var fun in contract.functionHashes) { for (var fun in contract.functionHashes) {
funHashes += contract.functionHashes[fun] + ' ' + fun + '\n' funHashes += contract.functionHashes[fun] + ' ' + fun + '\n'
} }
details.append(this.preRow('Functions', funHashes)) if (funHashes.length > 0) {
details.append(this.preRow('Functions', funHashes))
}
var gasEstimates = this.formatGasEstimates(contract.gasEstimates) var gasEstimates = this.formatGasEstimates(contract.gasEstimates)
if (gasEstimates) { if (gasEstimates) {
......
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