gaspersic/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Moved Ext app js to its own dir

Browse Source
This commit is contained in:
obscuren
2014-05-10 01:57:10 +02:00
parent 0bf2d24cb0
commit 1471585af0
6 changed files with 12 additions and 252 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ethereal/ui/gui.go
View File

@@ -9,6 +9,7 @@ import (
"github.com/ethereum/eth-go/ethpub"
"github.com/ethereum/eth-go/ethutil"
"github.com/go-qml/qml"
"github.com/obscuren/mutan"
"math/big"
"strings"
)
@@ -220,5 +221,9 @@ func (gui *Gui) Transact(recipient, value, gas, gasPrice, data string) (*ethpub.
}
func (gui *Gui) Create(recipient, value, gas, gasPrice, data string) (*ethpub.PReceipt, error) {
return gui.Transact(recipient, value, gas, gasPrice, data)
keyPair := ethutil.Config.Db.GetKeys()[0]
mainInput, initInput := mutan.PreProcess(data)
return gui.pub.Create(ethutil.Hex(keyPair.PrivateKey), value, gas, gasPrice, initInput, mainInput)
}

10
ethereal/ui/ui_lib.go
View File

@@ -59,14 +59,6 @@ func (ui *UiLib) OpenHtml(path string) {
go app.run()
}
func (ui *UiLib) Watch(addr, storageAddr string) {
if len(storageAddr) == 0 {
ui.eth.Reactor().Subscribe("storage:"+string(ethutil.FromHex(addr))+":"+string(ethutil.FromHex(storageAddr)), nil)
} else {
ui.eth.Reactor().Subscribe("object:"+string(ethutil.FromHex(addr)), nil)
}
}
func (ui *UiLib) Muted(content string) {
component, err := ui.engine.LoadFile(ui.AssetPath("qml/muted.qml"))
if err != nil {
@@ -78,8 +70,6 @@ func (ui *UiLib) Muted(content string) {
go func() {
path := "file://" + ui.AssetPath("muted/index.html")
win.Set("url", path)
//debuggerPath := "file://" + ui.AssetPath("muted/debugger.html")
//win.Set("debugUrl", debuggerPath)
win.Show()
win.Wait()