diff options
| author | obscuren <geffobscura@gmail.com> | 2015-02-05 04:52:17 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-02-05 04:52:34 +0800 |
| commit | 7c278d6ac20e7f34816f02d6db7f8aeb5d8ebc94 (patch) | |
| tree | b3e541941c0a6b8f8c9772034bd77cece339b355 /cmd/mist/assets/ext/ethereum.js/example/balance.html | |
| parent | 3f03197daebace568a61bf69c06c97e30080a749 (diff) | |
| parent | 859a1999cb204d2c6fcb08d6569c738c5af5cd86 (diff) | |
| download | go-tangerine-7c278d6ac20e7f34816f02d6db7f8aeb5d8ebc94.tar.gz go-tangerine-7c278d6ac20e7f34816f02d6db7f8aeb5d8ebc94.tar.zst go-tangerine-7c278d6ac20e7f34816f02d6db7f8aeb5d8ebc94.zip | |
updated tests
Diffstat (limited to 'cmd/mist/assets/ext/ethereum.js/example/balance.html')
| -rw-r--r-- | cmd/mist/assets/ext/ethereum.js/example/balance.html | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/cmd/mist/assets/ext/ethereum.js/example/balance.html b/cmd/mist/assets/ext/ethereum.js/example/balance.html index 4b51c5a7d..616d4eb6f 100644 --- a/cmd/mist/assets/ext/ethereum.js/example/balance.html +++ b/cmd/mist/assets/ext/ethereum.js/example/balance.html @@ -17,7 +17,11 @@ var originalBalance = web3.toDecimal(balance); document.getElementById('original').innerText = 'original balance: ' + originalBalance + ' watching...'; +<<<<<<< HEAD:cmd/mist/assets/ext/ethereum.js/example/balance.html var filter = web3.eth.watch({address: coinbase}).changed(function() { +======= + web3.eth.watch('pending').changed(function() { +>>>>>>> 859a1999cb204d2c6fcb08d6569c738c5af5cd86:example/balance.html balance = web3.eth.balanceAt(coinbase) var currentBalance = web3.toDecimal(balance); document.getElementById("current").innerText = 'current: ' + currentBalance; |