mirror of https://github.com/status-im/web3.js.git
messageHandler expects object instead of string
This commit is contained in:
parent
ea3048421f
commit
f7c9c8928e
4
http.js
4
http.js
|
@ -16,10 +16,10 @@
|
|||
function formatJsonRpcMessage(message) {
|
||||
var object = JSON.parse(message);
|
||||
|
||||
return JSON.stringify({
|
||||
return {
|
||||
_id: object.id,
|
||||
data: object.result
|
||||
});
|
||||
};
|
||||
};
|
||||
|
||||
HttpProvider.prototype.send = function (payload) {
|
||||
|
|
3
main.js
3
main.js
|
@ -489,8 +489,7 @@
|
|||
}
|
||||
});
|
||||
|
||||
function messageHandler(ev) {
|
||||
var data = JSON.parse(ev)
|
||||
function messageHandler(data) {
|
||||
|
||||
if(data._event !== undefined) {
|
||||
web3.trigger(data._event, data.data);
|
||||
|
|
14
qt.js
14
qt.js
|
@ -1,12 +1,22 @@
|
|||
(function() {
|
||||
var QtProvider = function() {};
|
||||
var QtProvider = function() {
|
||||
this.handlers = [];
|
||||
|
||||
var self = this;
|
||||
navigator.qt.onmessage = function (message) {
|
||||
self.handlers.forEach(function (handler) {
|
||||
handler.call(self, JSON.parse(message));
|
||||
});
|
||||
}
|
||||
};
|
||||
|
||||
QtProvider.prototype.send = function(payload) {
|
||||
navigator.qt.postData(JSON.stringify(payload));
|
||||
};
|
||||
|
||||
Object.defineProperty(QtProvider.prototype, "onmessage", {
|
||||
set: function(handler) {
|
||||
navigator.qt.onmessage = handler;
|
||||
this.handlers.push(handler);
|
||||
},
|
||||
});
|
||||
|
||||
|
|
|
@ -11,7 +11,7 @@
|
|||
var self = this;
|
||||
this.ws.onmessage = function(event) {
|
||||
for(var i = 0; i < self.handlers.length; i++) {
|
||||
self.handlers[i].call(self, event.data, event)
|
||||
self.handlers[i].call(self, JSON.parse(event.data), event)
|
||||
}
|
||||
};
|
||||
|
||||
|
|
Loading…
Reference in New Issue