infra
/
cryptpad
2
1
Fork 0
Code Issues Pull Requests Projects Releases 1 Activity

fix function signatures

pull/1/head
ansuz 2017-10-03 14:08:40 +02:00
parent 351b95d6a9
commit 09c0a473e2
2 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
www/common/sframe-common-outer.js
View File

@ -447,7 +447,6 @@ define([
});
});
sframeChan.on('Q_CONTACTS_GET_FRIEND_INFO', function (curvePublic, cb) {
console.error(curvePublic);
messenger.getFriendInfo(curvePublic, function (e, info) {
cb({
error: e,

21
www/common/sframe-messenger-inner.js
View File

@ -18,38 +18,32 @@ define([], function () {
_handlers[key].push(f);
};
sFrameChan.on('EV_CONTACTS_MESSAGE', function (err, data) {
//if (err || data.error) { return void console.error(err || data.error); }
sFrameChan.on('EV_CONTACTS_MESSAGE', function (data) {
_handlers.message.forEach(function (f) {
f(err || data.error, data);
f(data);
});
});
sFrameChan.on('EV_CONTACTS_JOIN', function (err, data) {
if (err || data.error) { return void console.error(err || data.error); }
sFrameChan.on('EV_CONTACTS_JOIN', function (data) {
_handlers.join.forEach(function (f) {
f(data.curvePublic, data.channel);
});
});
sFrameChan.on('EV_CONTACTS_LEAVE', function (err, data) {
if (err || data.error) { return void console.error(err || data.error); }
sFrameChan.on('EV_CONTACTS_LEAVE', function (data) {
_handlers.leave.forEach(function (f) {
f(data.curvePublic, data.channel);
});
});
sFrameChan.on('EV_CONTACTS_UPDATE', function (err, data) {
if (err || data.error) { return void console.error(err || data.error); }
sFrameChan.on('EV_CONTACTS_UPDATE', function (data) {
_handlers.update.forEach(function (f) {
f(data.info, data.curvePublic);
});
});
sFrameChan.on('EV_CONTACTS_FRIEND', function (err, data) {
if (err || data.error) { return void console.error(err || data.error); }
sFrameChan.on('EV_CONTACTS_FRIEND', function (data) {
_handlers.friend.forEach(function (f) {
f(data.curvePublic);
});
});
sFrameChan.on('EV_CONTACTS_UNFRIEND', function (err, data) {
if (err || data.error) { return void console.error(err || data.error); }
sFrameChan.on('EV_CONTACTS_UNFRIEND', function (data) {
_handlers.unfriend.forEach(function (f) {
f(data.curvePublic);
});
@ -58,7 +52,6 @@ define([], function () {
/*** QUERIES ***/
messenger.getFriendList = function (cb) {
sFrameChan.query('Q_CONTACTS_GET_FRIEND_LIST', null, function (err, data) {
console.error('GET FRIEND LIST');
cb(err || data.error, data.data);
});
};