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

lint compliance

Browse Source
This commit is contained in:
yflory
2019-09-30 15:20:44 +02:00
parent 295a712942
commit 7b4a72b3a2
2 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
www/common/outer/team.js
View File

@@ -301,7 +301,7 @@ define([
userName: 'team', userName: 'team',
classic: true classic: true
}; };
cfg.onMetadataUpdate = function (md) { cfg.onMetadataUpdate = function () {
var team = ctx.teams[id]; var team = ctx.teams[id];
if (!team) { return; } if (!team) { return; }
ctx.emit('ROSTER_CHANGE', id, team.clients); ctx.emit('ROSTER_CHANGE', id, team.clients);
@@ -456,7 +456,8 @@ define([
})); }));
}).nThen(function () { }).nThen(function () {
var id = Util.createRandomInteger(); var id = Util.createRandomInteger();
config.onMetadataUpdate = function (md) { config.onMetadataUpdate = function () {
var team = ctx.teams[id];
if (!team) { return; } if (!team) { return; }
ctx.emit('ROSTER_CHANGE', id, team.clients); ctx.emit('ROSTER_CHANGE', id, team.clients);
}; };
@@ -852,12 +853,10 @@ define([
var user = state.members[data.curvePublic]; var user = state.members[data.curvePublic];
// It it is an ownership revocation, we have to set it in pad metadata first // It it is an ownership revocation, we have to set it in pad metadata first
console.log(user.role, data.data.role);
if (user.role === "OWNER" && data.data.role !== "OWNER") { if (user.role === "OWNER" && data.data.role !== "OWNER") {
revokeOwnership(ctx, teamId, user, function (err) { revokeOwnership(ctx, teamId, user, function (err) {
console.error(err);
if (!err) { return; } if (!err) { return; }
waitFor.abort(); console.error(err);
return void cb({error: err}); return void cb({error: err});
}); });
return; return;

12
www/teams/inner.js
View File

@@ -443,12 +443,13 @@ define([
var theirRole = ROLES.indexOf(data.role) || 0; var theirRole = ROLES.indexOf(data.role) || 0;
// If they're an admin and I am an owner, I can promote them to owner // If they're an admin and I am an owner, I can promote them to owner
if (!isMe && myRole > theirRole && theirRole === 1 && !data.pending) { if (!isMe && myRole > theirRole && theirRole === 1 && !data.pending) {
var promote = h('span.fa.fa-angle-double-up', { var promoteOwner = h('span.fa.fa-angle-double-up', {
title: "Offer ownership" // XXX title: "Offer ownership" // XXX
}); });
$(promote).click(function () { $(promoteOwner).click(function () {
$(promote).hide(); $(promoteOwner).hide();
UI.confirm("Are you sure???", function (yes) { // XXX UI.confirm("Are you sure???", function (yes) { // XXX
if (!yes) { return; }
APP.module.execCommand('OFFER_OWNERSHIP', { APP.module.execCommand('OFFER_OWNERSHIP', {
teamId: APP.team, teamId: APP.team,
curvePublic: data.curvePublic curvePublic: data.curvePublic
@@ -461,7 +462,7 @@ define([
}); });
}); });
}); });
$actions.append(promote); $actions.append(promoteOwner);
} }
// If they're a member and I have a higher role than them, I can promote them to admin // If they're a member and I have a higher role than them, I can promote them to admin
if (!isMe && myRole > theirRole && theirRole === 0 && !data.pending) { if (!isMe && myRole > theirRole && theirRole === 0 && !data.pending) {
@@ -754,6 +755,7 @@ define([
$(deleteTeam).click(function () { $(deleteTeam).click(function () {
if (deleting) { return; } if (deleting) { return; }
UI.confirm("Are you sure", function (yes) { // XXX UI.confirm("Are you sure", function (yes) { // XXX
if (!yes) { return; }
if (deleting) { return; } if (deleting) { return; }
deleting = true; deleting = true;
$spinner.show(); $spinner.show();
@@ -761,7 +763,7 @@ define([
teamId: APP.team teamId: APP.team
}, function (obj) { }, function (obj) {
$spinner.hide(); $spinner.hide();
deleting = false deleting = false;
if (obj && obj.error) { if (obj && obj.error) {
return void UI.warn(obj.error); return void UI.warn(obj.error);
} }