status-im/embark-area-51
2
0
Fork 0
mirror of https://github.com/status-im/embark-area-51.git synced 2025-02-02 10:25:21 +00:00
Code Issues Projects Releases Wiki Activity

add optionnal callback

Browse Source
This commit is contained in:
Jonathan Rainville 2018-05-02 12:10:11 -04:00
parent 0cffff067a
commit 41b2741ba5
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
js/embark.js
View File

@ -263,11 +263,11 @@ EmbarkJS.Messages.sendMessage = function(options) {
return this.currentMessages.sendMessage(options); return this.currentMessages.sendMessage(options);
}; };
EmbarkJS.Messages.listenTo = function(options) { EmbarkJS.Messages.listenTo = function(options, callback) {
if (!this.currentMessages) { if (!this.currentMessages) {
throw new Error('Messages provider not set; e.g EmbarkJS.Messages.setProvider("whisper")'); throw new Error('Messages provider not set; e.g EmbarkJS.Messages.setProvider("whisper")');
} }
return this.currentMessages.listenTo(options); return this.currentMessages.listenTo(options, callback);
}; };
EmbarkJS.Utils = { EmbarkJS.Utils = {

7
lib/modules/whisper/js/embarkjs.js
View File

@ -64,7 +64,7 @@ __embarkWhisperNewWeb3.sendMessage = function (options) {
}); });
}; };
__embarkWhisperNewWeb3.listenTo = function (options) { __embarkWhisperNewWeb3.listenTo = function (options, callback) {
var topics = options.topic || options.topics; var topics = options.topic || options.topics;
let promise = new __MessageEvents(); let promise = new __MessageEvents();
@ -82,12 +82,15 @@ __embarkWhisperNewWeb3.listenTo = function (options) {
var payload = JSON.parse(EmbarkJS.Utils.toAscii(result.payload)); var payload = JSON.parse(EmbarkJS.Utils.toAscii(result.payload));
var data; var data;
data = { data = {
topic: result.topic, topic: EmbarkJS.Utils.toAscii(result.topic),
data: payload, data: payload,
//from: result.from, //from: result.from,
time: result.timestamp time: result.timestamp
}; };
if (callback) {
return callback(null, data);
}
promise.cb(payload, data, result); promise.cb(payload, data, result);
}); });