aboutsummaryrefslogtreecommitdiffstats
path: root/cmd/mist/assets
diff options
context:
space:
mode:
authorJeffrey Wilcke <jeffrey@ethereum.org>2015-04-24 19:34:51 +0800
committerJeffrey Wilcke <jeffrey@ethereum.org>2015-04-24 19:34:51 +0800
commit31811365e0991a190748721d1549334043fda73c (patch)
tree98cd6f587e10fb8b1dc0685c1ee3b0e0c4eae29d /cmd/mist/assets
parentb6ec1c720fc65d8bac36bd2e28bf1df1de1ffe5b (diff)
parentdc62fb2ee927f1fe94cb6377fbde2ad6af3b9fac (diff)
downloaddexon-31811365e0991a190748721d1549334043fda73c.tar
dexon-31811365e0991a190748721d1549334043fda73c.tar.gz
dexon-31811365e0991a190748721d1549334043fda73c.tar.bz2
dexon-31811365e0991a190748721d1549334043fda73c.tar.lz
dexon-31811365e0991a190748721d1549334043fda73c.tar.xz
dexon-31811365e0991a190748721d1549334043fda73c.tar.zst
dexon-31811365e0991a190748721d1549334043fda73c.zip
Merge pull request #800 from obscuren/ethereum_js_update
Ethereum js update
Diffstat (limited to 'cmd/mist/assets')
-rw-r--r--cmd/mist/assets/examples/coin.html3
m---------cmd/mist/assets/ext/ethereum.js0
2 files changed, 1 insertions, 2 deletions
diff --git a/cmd/mist/assets/examples/coin.html b/cmd/mist/assets/examples/coin.html
index e78f2d73f..e6baf4579 100644
--- a/cmd/mist/assets/examples/coin.html
+++ b/cmd/mist/assets/examples/coin.html
@@ -3,7 +3,7 @@
<title>JevCoin</title>
<head>
<script type="text/javascript" src="../ext/bignumber.min.js"></script>
-<script type="text/javascript" src="../ext/ethereum.js/dist/ethereum-light.min.js"></script>
+<script type="text/javascript" src="../ext/ethereum.js/dist/web3-light.min.js"></script>
</head>
<body>
@@ -32,7 +32,6 @@
</body>
<script type="text/javascript">
- var web3 = require('ethereum.js');
var eth = web3.eth;
web3.setProvider(new web3.providers.HttpProvider('http://localhost:8545'));
diff --git a/cmd/mist/assets/ext/ethereum.js b/cmd/mist/assets/ext/ethereum.js
-Subproject c80ede50c3b60a482f1ec76038325ec52f5e73b
+Subproject f8a43eddfb450d0e0ba1669a6916babe0ea4364