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

Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging

Browse Source
This commit is contained in:
Caleb James DeLisle 2017-10-23 14:22:54 +03:00
commit 9b02b36724
4 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -468,6 +468,14 @@ define([
}); });
}); });
}); });
sframeChan.on('Q_CONTACTS_REMOVE_FRIEND', function (curvePublic, cb) {
messenger.removeFriend(curvePublic, function (e, info) {
cb({
error: e,
data: info,
});
});
});
sframeChan.on('Q_CONTACTS_OPEN_FRIEND_CHANNEL', function (curvePublic, cb) { sframeChan.on('Q_CONTACTS_OPEN_FRIEND_CHANNEL', function (curvePublic, cb) {
messenger.openFriendChannel(curvePublic, function (e) { messenger.openFriendChannel(curvePublic, function (e) {

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

@ -66,6 +66,11 @@ define([], function () {
//cb({ error: err, data: data, }); //cb({ error: err, data: data, });
}); });
}; };
messenger.removeFriend = function (curvePublic, cb) {
sFrameChan.query('Q_CONTACTS_REMOVE_FRIEND', curvePublic, function (err, data) {
cb(err || data.error, data.data);
});
};
messenger.openFriendChannel = function (curvePublic, cb) { messenger.openFriendChannel = function (curvePublic, cb) {
sFrameChan.query('Q_CONTACTS_OPEN_FRIEND_CHANNEL', curvePublic, function (err, data) { sFrameChan.query('Q_CONTACTS_OPEN_FRIEND_CHANNEL', curvePublic, function (err, data) {
cb(err || data.error); cb(err || data.error);

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

@ -148,6 +148,7 @@ define({
'Q_CONTACTS_GET_FRIEND_LIST': true, 'Q_CONTACTS_GET_FRIEND_LIST': true,
'Q_CONTACTS_GET_MY_INFO': true, 'Q_CONTACTS_GET_MY_INFO': true,
'Q_CONTACTS_GET_FRIEND_INFO': true, 'Q_CONTACTS_GET_FRIEND_INFO': true,
'Q_CONTACTS_REMOVE_FRIEND': true,
'Q_CONTACTS_OPEN_FRIEND_CHANNEL': true, 'Q_CONTACTS_OPEN_FRIEND_CHANNEL': true,
'Q_CONTACTS_GET_STATUS': true, 'Q_CONTACTS_GET_STATUS': true,
'Q_CONTACTS_GET_MORE_HISTORY': true, 'Q_CONTACTS_GET_MORE_HISTORY': true,

4
www/contacts/messenger-ui.js
View File

@ -318,10 +318,10 @@ define([
}; };
var removeFriend = function (curvePublic) { var removeFriend = function (curvePublic) {
messenger.removeFriend(curvePublic, function (e, removed) { messenger.removeFriend(curvePublic, function (e /*, removed */) {
if (e) { return void console.error(e); } if (e) { return void console.error(e); }
find.inList(curvePublic).remove(); find.inList(curvePublic).remove();
console.log(removed); //console.log(removed);
}); });
}; };