diff options
| author | Maran <maran.hidskes@gmail.com> | 2014-05-02 19:35:44 +0800 |
|---|---|---|
| committer | Maran <maran.hidskes@gmail.com> | 2014-05-02 19:35:44 +0800 |
| commit | 60f9966cd8f991967882dd61e602822a95681d85 (patch) | |
| tree | 037e8d0a7a9a546b10ddef65be17a0328b62d551 /ethereal/assets/qml/webapp.qml | |
| parent | 3424bf17ca791b97ea512bef5290d1a52c1758af (diff) | |
| parent | f1da6f0564696f4fb5a6c04d1b9e24ed12432d63 (diff) | |
| download | go-tangerine-60f9966cd8f991967882dd61e602822a95681d85.tar.gz go-tangerine-60f9966cd8f991967882dd61e602822a95681d85.tar.zst go-tangerine-60f9966cd8f991967882dd61e602822a95681d85.zip | |
Merge branch 'develop' into feature/rpc
Diffstat (limited to 'ethereal/assets/qml/webapp.qml')
| -rw-r--r-- | ethereal/assets/qml/webapp.qml | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/ethereal/assets/qml/webapp.qml b/ethereal/assets/qml/webapp.qml index c0df0b66e..4bac12ef0 100644 --- a/ethereal/assets/qml/webapp.qml +++ b/ethereal/assets/qml/webapp.qml @@ -60,6 +60,7 @@ ApplicationWindow { var tx = eth.transact(data.args[0], data.args[1], data.args[2],data.args[3],data.args[4],data.args[5]) postData(data._seed, tx) + break case "create": postData(data._seed, null) @@ -91,6 +92,12 @@ ApplicationWindow { require(1) postData(data._seed, null) break; + case "set": + for(var key in data.args) { + if(webview.hasOwnProperty(key)) { + window[key] = data.args[key]; + } + } } } catch(e) { console.log(data.call + ": " + e) @@ -117,6 +124,8 @@ ApplicationWindow { function onObjectChangeCb(stateObject) { postEvent("object:"+stateObject.address(), stateObject) } + function onStorageChangeCb() { + } } Rectangle { |