web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ensure that function signatures are correct

Browse Source
This commit is contained in:
ansuz 2017-08-28 11:40:31 +02:00
parent 91f6e3e543
commit c66a0c55e0
4 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
www/common/common-messaging.js
View File

@ -79,9 +79,11 @@ define([
friends[pubKey] = data; friends[pubKey] = data;
Realtime.whenRealtimeSyncs(common.getRealtime(), function () { Realtime.whenRealtimeSyncs(common, common.getRealtime(), function () {
cb(); cb();
common.pinPads([data.channel]); common.pinPads([data.channel], function (e) {
if (e) { console.error(e); }
});
}); });
common.changeDisplayName(proxy[common.displayNameKey]); common.changeDisplayName(proxy[common.displayNameKey]);
}; };

17
www/common/common-messenger.js
View File

@ -47,15 +47,6 @@ define([
return proxy.friends ? proxy.friends[pubkey] : undefined; return proxy.friends ? proxy.friends[pubkey] : undefined;
}; };
// TODO make this async
var removeFromFriendList = function (proxy, realtime, curvePublic, cb) {
if (!proxy.friends) { return; }
var friends = proxy.friends;
delete friends[curvePublic];
Realtime.whenRealtimeSyncs(realtime, cb);
};
// TODO make this async
var getFriendList = Msg.getFriendList = function (proxy) { var getFriendList = Msg.getFriendList = function (proxy) {
if (!proxy.friends) { proxy.friends = {}; } if (!proxy.friends) { proxy.friends = {}; }
return proxy.friends; return proxy.friends;
@ -93,9 +84,11 @@ define([
friends[pubKey] = data; friends[pubKey] = data;
Realtime.whenRealtimeSyncs(common.getRealtime(), function () { Realtime.whenRealtimeSyncs(common, common.getRealtime(), function () {
cb(); cb();
common.pinPads([data.channel]); common.pinPads([data.channel], function (e) {
if (e) { console.error(e); }
});
}); });
common.changeDisplayName(proxy[common.displayNameKey]); common.changeDisplayName(proxy[common.displayNameKey]);
}; };
@ -213,14 +206,12 @@ define([
pendingRequests.push(netfluxId); pendingRequests.push(netfluxId);
var proxy = common.getProxy(); var proxy = common.getProxy();
// this redraws the userlist after a change has occurred // this redraws the userlist after a change has occurred
// TODO rename this function to reflect its purpose
common.changeDisplayName(proxy[common.displayNameKey]); common.changeDisplayName(proxy[common.displayNameKey]);
} }
network.sendto(netfluxId, msgStr); network.sendto(netfluxId, msgStr);
}; };
Msg.messenger = function (common) { Msg.messenger = function (common) {
'use strict';
var messenger = { var messenger = {
handlers: { handlers: {
message: [], message: [],

4
www/common/common-realtime.js
View File

@ -16,6 +16,10 @@ define([
TODO make this not blow up when disconnected or lagging... TODO make this not blow up when disconnected or lagging...
*/ */
common.whenRealtimeSyncs = function (Cryptpad, realtime, cb) { common.whenRealtimeSyncs = function (Cryptpad, realtime, cb) {
if (typeof(realtime.getAuthDoc) !== 'function') {
return void console.error('improper use of this function');
}
window.setTimeout(function () { window.setTimeout(function () {
if (realtime.getAuthDoc() === realtime.getUserDoc()) { if (realtime.getAuthDoc() === realtime.getUserDoc()) {
return void cb(); return void cb();

4
www/common/rpc.js
View File

@ -24,6 +24,10 @@ types of messages:
var hkn = network.historyKeeper; var hkn = network.historyKeeper;
var txid = uid(); var txid = uid();
if (typeof(cb) !== 'function') {
return console.error('expected callback');
}
var pending = ctx.pending[txid] = function (err, response) { var pending = ctx.pending[txid] = function (err, response) {
cb(err, response); cb(err, response);
}; };