diff options
| author | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-05-08 19:39:33 +0800 |
|---|---|---|
| committer | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-05-08 19:39:33 +0800 |
| commit | 15bfae52d253258829c10b14b43b02c73e3f7d04 (patch) | |
| tree | 201e4e8b7ab545594bd1ef3dfeb75faba80a2e11 /cmd | |
| parent | 03473d48c1436380b9248e65803ba56e1c584663 (diff) | |
| parent | f6e71b5749a52df7be26abb2ae0f3731aaaaca08 (diff) | |
| download | go-tangerine-15bfae52d253258829c10b14b43b02c73e3f7d04.tar go-tangerine-15bfae52d253258829c10b14b43b02c73e3f7d04.tar.gz go-tangerine-15bfae52d253258829c10b14b43b02c73e3f7d04.tar.bz2 go-tangerine-15bfae52d253258829c10b14b43b02c73e3f7d04.tar.lz go-tangerine-15bfae52d253258829c10b14b43b02c73e3f7d04.tar.xz go-tangerine-15bfae52d253258829c10b14b43b02c73e3f7d04.tar.zst go-tangerine-15bfae52d253258829c10b14b43b02c73e3f7d04.zip | |
Merge pull request #876 from obscuren/jsre_fixes
jsre, cmd/geth: updated web3.js and altered settimeout
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/geth/js.go | 6 | ||||
| m--------- | cmd/mist/assets/ext/ethereum.js | 0 |
2 files changed, 0 insertions, 6 deletions
diff --git a/cmd/geth/js.go b/cmd/geth/js.go index c9839dabb..9b0ab0a1b 100644 --- a/cmd/geth/js.go +++ b/cmd/geth/js.go @@ -117,12 +117,6 @@ func (js *jsre) apiBindings(f xeth.Frontend) { utils.Fatalf("Error loading bignumber.js: %v", err) } - // we need to declare a dummy setTimeout. Otto does not support it - _, err = js.re.Eval("setTimeout = function(cb, delay) {};") - if err != nil { - utils.Fatalf("Error defining setTimeout: %v", err) - } - err = js.re.Compile("ethereum.js", re.Ethereum_JS) if err != nil { utils.Fatalf("Error loading ethereum.js: %v", err) diff --git a/cmd/mist/assets/ext/ethereum.js b/cmd/mist/assets/ext/ethereum.js -Subproject 3b799d128452639463424c657956ee90a28daec +Subproject 08f3aaea8cad2cf07276d6709e2ee384afe90d3 |