diff options
| author | obscuren <geffobscura@gmail.com> | 2014-05-10 07:57:10 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2014-05-10 07:57:10 +0800 |
| commit | 1471585af082632b33eae5bf489d0ae0b277b369 (patch) | |
| tree | e384ca2962012872d4cdaf3f2108c2eab8cd7ef9 /ethereal/assets/qml | |
| parent | 0bf2d24cb030ec53abedf483189ecbaa3c9676be (diff) | |
| download | dexon-1471585af082632b33eae5bf489d0ae0b277b369.tar dexon-1471585af082632b33eae5bf489d0ae0b277b369.tar.gz dexon-1471585af082632b33eae5bf489d0ae0b277b369.tar.bz2 dexon-1471585af082632b33eae5bf489d0ae0b277b369.tar.lz dexon-1471585af082632b33eae5bf489d0ae0b277b369.tar.xz dexon-1471585af082632b33eae5bf489d0ae0b277b369.tar.zst dexon-1471585af082632b33eae5bf489d0ae0b277b369.zip | |
Moved Ext app js to its own dir
Diffstat (limited to 'ethereal/assets/qml')
| -rw-r--r-- | ethereal/assets/qml/newTransaction/_new_contract.qml | 2 | ||||
| -rw-r--r-- | ethereal/assets/qml/webapp.qml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ethereal/assets/qml/newTransaction/_new_contract.qml b/ethereal/assets/qml/newTransaction/_new_contract.qml index f6ed77fb6..f8f3d53a0 100644 --- a/ethereal/assets/qml/newTransaction/_new_contract.qml +++ b/ethereal/assets/qml/newTransaction/_new_contract.qml @@ -158,7 +158,7 @@ Component { mainContractColumn.state = "ERROR" } else { txResult.text = "Your transaction has been submitted:\n" - txOutput.text = res[0] + txOutput.text = res[0].address mainContractColumn.state = "DONE" } } diff --git a/ethereal/assets/qml/webapp.qml b/ethereal/assets/qml/webapp.qml index d02c9a82e..1f3c3874a 100644 --- a/ethereal/assets/qml/webapp.qml +++ b/ethereal/assets/qml/webapp.qml @@ -39,7 +39,7 @@ ApplicationWindow { experimental.preferences.javascriptEnabled: true experimental.preferences.navigatorQtObjectEnabled: true experimental.preferences.developerExtrasEnabled: true - experimental.userScripts: [ui.assetPath("ethereum.js")] + experimental.userScripts: [ui.assetPath("ext/pre.js"), ui.assetPath("ext/big.js"), ui.assetPath("ext/string.js"), ui.assetPath("ext/ethereum.js")] experimental.onMessageReceived: { console.log("[onMessageReceived]: ", message.data) // TODO move to messaging.js |