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

Add comments and XXX

Browse Source
This commit is contained in:
yflory 2019-09-23 14:35:57 +02:00
parent 4128c34b93
commit 83bc0d84f0
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
www/common/common-ui-elements.js
View File

@ -759,6 +759,8 @@ define([
var teams = {};
if (privateData.enableTeams) {
Object.keys(teamsData).forEach(function (id) {
// config.teamId only exists when we're trying to share a pad from a team drive
// In this case, we don't want to share the pad with the current team
if (config.teamId && config.teamId === id) { return; }
var t = teamsData[id];
teams[t.edPublic] = {
@ -769,7 +771,7 @@ define([
id: id
};
});
var teamsList = UIElements.getFriendsList('Share with a team', {
var teamsList = UIElements.getFriendsList('Share with a team', { // XXX
common: common,
noFilter: true,
friends: teams

2
www/common/notifications.js
View File

@ -262,6 +262,7 @@ define([
var teamName = Util.fixHTML(Util.find(msg, ['content', 'team', 'metadata', 'name']) || '');
content.getFormatText = function () {
var text = name + " has invited you to join the team <b>" + teamName +"</b>";
// XXX
return text;
};
if (!content.archived) {
@ -280,6 +281,7 @@ define([
var teamName = Util.fixHTML(Util.find(msg, ['content', 'teamName']) || '');
content.getFormatText = function () {
var text = name + " has kicked you from join the team <b>" + teamName +"</b>";
// XXX
return text;
};
if (!content.archived) {

2
www/common/outer/async-store.js
View File

@ -66,7 +66,7 @@ define([
if (!s) { return void cb({ error: 'ENOTFOUND' }); }
nThen(function (waitFor) {
Realtime.whenRealtimeSyncs(s.realtime, waitFor());
if (s.sharedFolders) {
if (s.sharedFolders && typeof (s.sharedFolders) === "object") {
for (var k in s.sharedFolders) {
Realtime.whenRealtimeSyncs(s.sharedFolders[k].realtime, waitFor());
}