tornadocontrib/bsc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Support multiple promises as data or mixed with non promises

Browse Source
This commit is contained in:
obscuren 2014-09-25 10:32:54 +02:00
parent 29f5dd38e3
commit d5d1e50365
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -92,19 +92,19 @@
promises.push(params.from.then(function(_from) { params.from = _from; })); promises.push(params.from.then(function(_from) { params.from = _from; }));
} }
if(isPromise(params.data)) { if(typeof params.data !== "object" || isPromise(params.data)) {
promises.push(params.data.then(function(_code) { params.data = _code; })); params.data = [params.data]
} else { }
if(typeof params.data === "object") {
data = "";
for(var i = 0; i < params.data.length; i++) {
data += params.data[i]
}
} else {
data = params.data;
}
}
var data = params.data;
for(var i = 0; i < params.data.length; i++) {
if(isPromise(params.data[i])) {
var promise = params.data[i];
var _i = i;
promises.push(promise.then(function(_arg) { params.data[_i] = _arg; }));
}
}
// Make sure everything is string // Make sure everything is string
var fields = ["value", "gas", "gasPrice"]; var fields = ["value", "gas", "gasPrice"];
for(var i = 0; i < fields.length; i++) { for(var i = 0; i < fields.length; i++) {
@ -117,6 +117,7 @@
// Load promises then call the last "transact". // Load promises then call the last "transact".
return Q.all(promises).then(function() { return Q.all(promises).then(function() {
return new Promise(function(resolve, reject) { return new Promise(function(resolve, reject) {
params.data = params.data.join("");
postData({call: "transact", args: params}, function(data) { postData({call: "transact", args: params}, function(data) {
if(data[1]) if(data[1])
reject(data[0]); reject(data[0]);
@ -458,6 +459,7 @@
g_seed++; g_seed++;
console.log(data)
navigator.qt.postMessage(JSON.stringify(data)); navigator.qt.postMessage(JSON.stringify(data));
} }