roysc/plugeth
1
0
Fork 0
forked from cerc-io/plugeth
Code Pull Requests Activity

Merge branch 'hotfix/0.6.5-2' into develop

Browse Source
This commit is contained in:
obscuren 2014-09-23 17:56:50 +02:00
commit acfb5b85fb
5 changed files with 55 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mist/assets/ext/html_messaging.js
View File

@ -335,7 +335,7 @@
Object.defineProperty(eth, "gasPrice", {
get: function() {
return "1000000000000"
return "10000000000000"
}
});

2
mist/assets/qml/views/jeffcoin/jeffcoin.qml
View File

@ -151,7 +151,7 @@ Rectangle {
Button {
text: "Send"
onClicked: {
eth.transact({from: eth.key().privateKey, to:address, gas: "9000", gasPrice: "100000000000", data: ["0x"+txTo.text, txValue.text]})
eth.transact({from: eth.key().privateKey, to:address, gas: "9000", gasPrice: "10000000000000", data: ["0x"+txTo.text, txValue.text]})
}
}
}

13
mist/assets/qml/wallet.qml
View File

@ -14,7 +14,7 @@ ApplicationWindow {
property alias miningButtonText: miningButton.text
property var ethx : Eth.ethx
property var web
property var browser
width: 1200
height: 820
@ -29,7 +29,7 @@ ApplicationWindow {
//var messages = JSON.parse(data)
// Signal handler
messages(data, receiverSeed);
root.web.messages(data, receiverSeed);
root.browser.view.messages(data, receiverSeed);
}
TextField {
@ -47,7 +47,7 @@ ApplicationWindow {
Component.onCompleted: {
var wallet = addPlugin("./views/wallet.qml", {noAdd: true, close: false, section: "ethereum", active: true});
var browser = addPlugin("./webapp.qml", {noAdd: true, close: false, section: "ethereum", active: true});
root.web = browser.view;
root.browser = browser;
addPlugin("./views/transaction.qml", {noAdd: true, close: false, section: "legacy"});
addPlugin("./views/chain.qml", {noAdd: true, close: false, section: "legacy"});
@ -648,7 +648,12 @@ ApplicationWindow {
}
Keys.onReturnPressed: {
addPlugin(this.text, {close: true, section: "apps"})
if(/^https?/.test(this.text)) {
root.browser.view.open(this.text);
mainSplit.setView(root.browser.view, root.browser.menuItem);
} else {
addPlugin(this.text, {close: true, section: "apps"})
}
}
}

80
mist/assets/qml/webapp.qml
View File

@ -19,6 +19,48 @@ import "../ext/qml_messaging.js" as Messaging
property alias url: webview.url
property alias webView: webview
property var cleanPath: false
property var open: function(url) {
if(!window.cleanPath) {
var uri = url;
if(!/.*\:\/\/.*/.test(uri)) {
uri = "http://" + uri;
}
var reg = /(^https?\:\/\/(?:www\.)?)([a-zA-Z0-9_\-]*\.eth)(.*)/
if(reg.test(uri)) {
uri.replace(reg, function(match, pre, domain, path) {
uri = pre;
var lookup = eth.lookupDomain(domain.substring(0, domain.length - 4));
var ip = [];
for(var i = 0, l = lookup.length; i < l; i++) {
ip.push(lookup.charCodeAt(i))
}
if(ip.length != 0) {
uri += lookup;
} else {
uri += domain;
}
uri += path;
});
}
window.cleanPath = true;
webview.url = uri;
//uriNav.text = uri.text.replace(/(^https?\:\/\/(?:www\.)?)([a-zA-Z0-9_\-]*\.\w{2,3})(.*)/, "$1$2<span style='color:#CCC'>$3</span>");
uriNav.text = uri;
} else {
// Prevent inf loop.
window.cleanPath = false;
}
}
Component.onCompleted: {
webview.url = "http://etherian.io"
}
@ -103,43 +145,9 @@ import "../ext/qml_messaging.js" as Messaging
top: navBar.bottom
}
property var cleanPath: false
//property var cleanPath: false
onNavigationRequested: {
if(!this.cleanPath) {
var uri = request.url.toString();
if(!/.*\:\/\/.*/.test(uri)) {
uri = "http://" + uri;
}
var reg = /(^https?\:\/\/(?:www\.)?)([a-zA-Z0-9_\-]*\.eth)(.*)/
if(reg.test(uri)) {
uri.replace(reg, function(match, pre, domain, path) {
uri = pre;
var lookup = eth.lookupDomain(domain.substring(0, domain.length - 4));
var ip = [];
for(var i = 0, l = lookup.length; i < l; i++) {
ip.push(lookup.charCodeAt(i))
}
if(ip.length != 0) {
uri += lookup;
} else {
uri += domain;
}
uri += path;
});
}
this.cleanPath = true;
webview.url = uri;
} else {
// Prevent inf loop.
this.cleanPath = false;
}
window.open(request.url.toString());
}
function sendMessage(data) {

1
mist/ui_lib.go
View File

@ -240,7 +240,6 @@ func mapToTxParams(object map[string]interface{}) map[string]string {
dataStr += str
}
object["data"] = dataStr
fmt.Println(object)
conv := make(map[string]string)
for key, value := range object {