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

Display the friend list in the friend app

Browse Source
This commit is contained in:
yflory 2017-07-06 18:38:58 +02:00
parent a5e8f6ae81
commit 5c7441f82c
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -40,6 +40,7 @@ define([
}); });
} }
}); });
return $block;
}; };
Msg.createOwnedChannel = function (common, channelId, validateKey, owners, cb) { Msg.createOwnedChannel = function (common, channelId, validateKey, owners, cb) {
@ -86,7 +87,7 @@ define([
common.changeDisplayName(proxy[common.displayNameKey]); common.changeDisplayName(proxy[common.displayNameKey]);
}; };
var createData = function (common, hash) { var createData = Msg.createData = function (common, hash) {
var proxy = common.getProxy(); var proxy = common.getProxy();
return { return {
channel: hash || common.createChannelId(), channel: hash || common.createChannelId(),

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

@ -113,6 +113,10 @@ define([
// Messaging // Messaging
common.addDirectMessageHandler = Messaging.addDirectMessageHandler; common.addDirectMessageHandler = Messaging.addDirectMessageHandler;
common.inviteFromUserlist = Messaging.inviteFromUserlist; common.inviteFromUserlist = Messaging.inviteFromUserlist;
common.createOwnedChannel = Messaging.createOwnedChannel;
common.getFriendList = Messaging.getFriendList;
common.getFriendListUI = Messaging.getFriendListUI;
common.createData = Messaging.createData;
// Userlist // Userlist
common.createUserList = UserList.create; common.createUserList = UserList.create;

1
www/friends/main.js
View File

@ -37,6 +37,7 @@ define([
var toolbar = APP.toolbar = Toolbar.create(configTb); var toolbar = APP.toolbar = Toolbar.create(configTb);
toolbar.$rightside.html(''); // Remove the drawer if we don't use it to hide the toolbar toolbar.$rightside.html(''); // Remove the drawer if we don't use it to hide the toolbar
Cryptpad.getFriendListUI(Cryptpad).appendTo($list);
Cryptpad.removeLoadingScreen(); Cryptpad.removeLoadingScreen();
}; };