From ce52fcf080742941971865fd389fc4dfc0480574 Mon Sep 17 00:00:00 2001 From: Fabian Vogelsteller Date: Mon, 20 Jul 2015 16:44:25 +0200 Subject: [PATCH] fixed contract.new examples --- example/contract.html | 14 +++++++++----- example/contract_array.html | 14 +++++++++----- example/event_inc.html | 17 ++++++++++------- 3 files changed, 28 insertions(+), 17 deletions(-) diff --git a/example/contract.html b/example/contract.html index 0135be0..097b66c 100644 --- a/example/contract.html +++ b/example/contract.html @@ -34,14 +34,18 @@ // create contract document.getElementById('status').innerText = "transaction sent, waiting for confirmation"; web3.eth.contract(abi).new({data: code}, function (err, contract) { - if (err) { + if(err) { console.error(err); return; + + // callback fires twice, we only want the second call when the contract is deployed + } else if(contract.address){ + + myContract = contract; + console.log('address: ' + myContract.address); + document.getElementById('status').innerText = 'Mined!'; + document.getElementById('call').style.visibility = 'visible'; } - myContract = contract; - console.log('address: ' + myContract.address); - document.getElementById('status').innerText = 'Mined!'; - document.getElementById('call').style.visibility = 'visible'; }); } diff --git a/example/contract_array.html b/example/contract_array.html index f321910..752eb9a 100644 --- a/example/contract_array.html +++ b/example/contract_array.html @@ -37,12 +37,16 @@ if (err) { console.error(err); return; - } - myContract = contract; - console.log('address: ' + myContract.address); - document.getElementById('status').innerText = 'Mined!'; - document.getElementById('call').style.visibility = 'visible'; + // callback fires twice, we only want the second call when the contract is deployed + } else if(contract.address){ + + myContract = contract; + console.log('address: ' + myContract.address); + + document.getElementById('status').innerText = 'Mined!'; + document.getElementById('call').style.visibility = 'visible'; + } }); } diff --git a/example/event_inc.html b/example/event_inc.html index 0906927..bb3c99f 100644 --- a/example/event_inc.html +++ b/example/event_inc.html @@ -42,14 +42,17 @@ if (err) { console.error(err); return; + + // callback fires twice, we only want the second call when the contract is deployed + } else if(contract.address){ + + contract = c; + console.log('address: ' + contract.address); + document.getElementById('status').innerText = 'Mined!'; + document.getElementById('call').style.visibility = 'visible'; + + inc = contract.Incremented({odd: true}, update); } - - contract = c; - console.log('address: ' + contract.address); - document.getElementById('status').innerText = 'Mined!'; - document.getElementById('call').style.visibility = 'visible'; - - inc = contract.Incremented({odd: true}, update); }); };