aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorobscuren <geffobscura@gmail.com>2014-09-23 23:56:43 +0800
committerobscuren <geffobscura@gmail.com>2014-09-23 23:56:43 +0800
commit70db149494db983f24cb23e5eda03fef0265fc1b (patch)
treeb8bd5760a3c3e6002aeaf55fd16941f7be774e57
parent353b558536933523cd65f35eea23e2f904a5c378 (diff)
parenta4007f3b686b16e73b4cb9ebceb63f3755d31ff3 (diff)
downloadgo-tangerine-70db149494db983f24cb23e5eda03fef0265fc1b.tar
go-tangerine-70db149494db983f24cb23e5eda03fef0265fc1b.tar.gz
go-tangerine-70db149494db983f24cb23e5eda03fef0265fc1b.tar.bz2
go-tangerine-70db149494db983f24cb23e5eda03fef0265fc1b.tar.lz
go-tangerine-70db149494db983f24cb23e5eda03fef0265fc1b.tar.xz
go-tangerine-70db149494db983f24cb23e5eda03fef0265fc1b.tar.zst
go-tangerine-70db149494db983f24cb23e5eda03fef0265fc1b.zip
Merge branch 'hotfix/0.6.5-2'v0.6.5-2
-rw-r--r--mist/assets/ext/html_messaging.js2
-rw-r--r--mist/assets/qml/views/jeffcoin/jeffcoin.qml2
-rw-r--r--mist/assets/qml/wallet.qml13
-rw-r--r--mist/assets/qml/webapp.qml80
-rw-r--r--mist/ui_lib.go1
5 files changed, 55 insertions, 43 deletions
diff --git a/mist/assets/ext/html_messaging.js b/mist/assets/ext/html_messaging.js
index 3c67c77ea..efb950b4b 100644
--- a/mist/assets/ext/html_messaging.js
+++ b/mist/assets/ext/html_messaging.js
@@ -335,7 +335,7 @@
Object.defineProperty(eth, "gasPrice", {
get: function() {
- return "1000000000000"
+ return "10000000000000"
}
});
diff --git a/mist/assets/qml/views/jeffcoin/jeffcoin.qml b/mist/assets/qml/views/jeffcoin/jeffcoin.qml
index 6a57791a7..dc8678d1c 100644
--- a/mist/assets/qml/views/jeffcoin/jeffcoin.qml
+++ b/mist/assets/qml/views/jeffcoin/jeffcoin.qml
@@ -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]})
}
}
}
diff --git a/mist/assets/qml/wallet.qml b/mist/assets/qml/wallet.qml
index 8f4d9ba43..6075b621b 100644
--- a/mist/assets/qml/wallet.qml
+++ b/mist/assets/qml/wallet.qml
@@ -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"})
+ }
}
}
diff --git a/mist/assets/qml/webapp.qml b/mist/assets/qml/webapp.qml
index 8801b6b47..dde298484 100644
--- a/mist/assets/qml/webapp.qml
+++ b/mist/assets/qml/webapp.qml
@@ -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) {
diff --git a/mist/ui_lib.go b/mist/ui_lib.go
index a913af7db..e5ddd38c8 100644
--- a/mist/ui_lib.go
+++ b/mist/ui_lib.go
@@ -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 {