aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorobscuren <geffobscura@gmail.com>2014-05-02 04:59:16 +0800
committerobscuren <geffobscura@gmail.com>2014-05-02 04:59:16 +0800
commit9e481804a72ce78792826e215cf3660819bbb18a (patch)
treeacb76bcb9aea49eaefe725585fe607801ec32087
parent76cd14ab7b2e0d96652ffd63aa08c046294e06d6 (diff)
downloadgo-tangerine-9e481804a72ce78792826e215cf3660819bbb18a.tar.gz
go-tangerine-9e481804a72ce78792826e215cf3660819bbb18a.tar.zst
go-tangerine-9e481804a72ce78792826e215cf3660819bbb18a.zip
Added a 'set' method to change window settings for external applications
-rw-r--r--ethereal/assets/ethereum.js4
-rw-r--r--ethereal/assets/qml/webapp.qml6
-rw-r--r--ethereal/assets/samplecoin/samplecoin.html2
3 files changed, 12 insertions, 0 deletions
diff --git a/ethereal/assets/ethereum.js b/ethereal/assets/ethereum.js
index fd5091bd1..e5dae9248 100644
--- a/ethereal/assets/ethereum.js
+++ b/ethereal/assets/ethereum.js
@@ -71,6 +71,10 @@ window.eth = {
postData({call: "disconnect", args: [address, storageAddrOrCb]});
},
+ set: function(props) {
+ postData({call: "set", args: props});
+ },
+
on: function(event, cb) {
if(eth._onCallbacks[event] === undefined) {
eth._onCallbacks[event] = [];
diff --git a/ethereal/assets/qml/webapp.qml b/ethereal/assets/qml/webapp.qml
index c0df0b66e..1c1ac852d 100644
--- a/ethereal/assets/qml/webapp.qml
+++ b/ethereal/assets/qml/webapp.qml
@@ -91,6 +91,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)
diff --git a/ethereal/assets/samplecoin/samplecoin.html b/ethereal/assets/samplecoin/samplecoin.html
index 1f4d1e3e1..ba60cf951 100644
--- a/ethereal/assets/samplecoin/samplecoin.html
+++ b/ethereal/assets/samplecoin/samplecoin.html
@@ -21,6 +21,8 @@ function createTransaction() {
}
function init() {
+ eth.set({width: 500, title: "Hello world"})
+
eth.getKey(function(key) {
eth.getStorageAt(jefcoinAddr, key, function(storage) {
document.querySelector("#current-amount").innerHTML = storage;