blitzwing/cryptpad
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add to friend list

Browse source
This commit is contained in:
yflory 2017-07-05 18:42:32 +02:00
parent 4016a95540
commit 95e2efab89
2 changed files with 9 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
www/common/cryptpad-common.js
View file

@ -10,6 +10,7 @@ define([
'/common/common-userlist.js',
'/common/common-title.js',
'/common/common-metadata.js',
'/common/common-messaging.js',
'/common/common-codemirror.js',
'/common/common-file.js',
'/file/file-crypto.js',
@ -19,7 +20,7 @@ define([
'/customize/application_config.js',
'/common/media-tag.js',
], function ($, Config, Messages, Store, Util, Hash, UI, History, UserList, Title, Metadata,
CodeMirror, Files, FileCrypto, Clipboard, Pinpad, AppConfig, MediaTag) {
Messaging, CodeMirror, Files, FileCrypto, Clipboard, Pinpad, AppConfig, MediaTag) {
/* This file exposes functionality which is specific to Cryptpad, but not to
any particular pad type. This includes functions for committing metadata
@ -108,6 +109,10 @@ define([
common.findStronger = Hash.findStronger;
common.serializeHash = Hash.serializeHash;
// Messaging
common.addDirectMessageHandler = Messaging.addDirectMessageHandler;
common.inviteFromUserlist = Messaging.inviteFromUserlist;
// Userlist
common.createUserList = UserList.create;
@ -1185,22 +1190,6 @@ define([
return button;
};
// Messaging
var addDirectMessageHandler = function () {
var network = getNetwork();
if (!network) { return void console.error('Network not ready'); }
network.on('message', function (msg, sender) {
if (sender === network.historyKeeper) { return; }
});
};
common.inviteFromUserlist = function (netfluxId) {
var network = getNetwork();
network.sendto(netfluxId, '["FRIEND_REQ", "Salut"]')
};
var emoji_patt = /([\uD800-\uDBFF][\uDC00-\uDFFF])/;
var isEmoji = function (str) {
return emoji_patt.test(str);
@ -1706,7 +1695,7 @@ define([
Store.ready(function (err, storeObj) {
store = common.store = env.store = storeObj;
addDirectMessageHandler();
common.addDirectMessageHandler(common);
var proxy = getProxy();
var network = getNetwork();

5
www/common/toolbar2.js
View file

@ -209,13 +209,12 @@ define([
var name = data.name || Messages.anonymous;
var $span = $('<span>', {'title': name});
var $rightCol = $('<span>', {'class': 'right-col'});
var $name = $('<span>', {'class': 'name'}).text(name).appendTo($rightCol);
$('<span>', {'class': 'name'}).text(name).appendTo($rightCol);
// TODO: if account
var $button = $('<button>', {'class': 'friend'}).appendTo($rightCol);
$button.text('Add friend').click(function (e) {
console.log('TODO');
e.stopPropagation();
Cryptpad.inviteFromUserlist(data.netfluxId);
Cryptpad.inviteFromUserlist(Cryptpad, data.netfluxId);
});
// TODO: end if
if (data.profile) {