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

Add 'Join team' and 'Decline' buttons

Browse Source
This commit is contained in:
yflory
2019-12-17 17:27:41 +01:00
parent d9ae669015
commit cf2a624775
1 changed files with 42 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
www/teams/inner.js
View File

@@ -1060,41 +1060,47 @@ define([
errorBlock = h('div.alert.alert-danger', {style: 'display: none;'}), errorBlock = h('div.alert.alert-danger', {style: 'display: none;'}),
div div
]); ]);
var inviteDiv = h('div'); var declineButton = h('button.btn.btn-danger', Messages.friendRequest_decline);
var acceptButton = h('button.btn.btn-primary', 'JOIN TEAM'); // XXX
var inviteDiv = h('div', [
h('nav', [
declineButton,
acceptButton
])
]);
var $inviteDiv = $(inviteDiv); var $inviteDiv = $(inviteDiv);
$(declineButton).click(function() {
});
var process = function (pw) { var process = function (pw) {
$inviteDiv.empty(); $inviteDiv.empty();
var bytes64; var bytes64;
var button = h('button', 'XXX'); nThen(function (waitFor) {
button.onclick = function () { $inviteDiv.append(h('div', [
nThen(function (waitFor) { h('i.fa.fa-spin.fa-spinner'),
$inviteDiv.append(h('div', [ h('span', 'Scrypt...') // XXX
h('i.fa.fa-spin.fa-spinner'), ]));
h('span', 'Scrypt...') // XXX setTimeout(waitFor(), 150);
])); }).nThen(function (waitFor) {
setTimeout(waitFor(), 150); var salt = InviteInner.deriveSalt(pw, AppConfig.loginSalt);
}).nThen(function (waitFor) { InviteInner.deriveBytes(seeds.scrypt, salt, waitFor(function (bytes) {
var salt = InviteInner.deriveSalt(pw, AppConfig.loginSalt); bytes64 = bytes;
InviteInner.deriveBytes(seeds.scrypt, salt, waitFor(function (bytes) { }));
bytes64 = bytes; }).nThen(function (waitFor) {
})); APP.module.execCommand('GET_LINK_DATA', {
}).nThen(function (waitFor) { bytes64: bytes64,
APP.module.execCommand('GET_LINK_DATA', { hash: hash,
bytes64: bytes64, password: pw,
hash: hash, }, waitFor(function () {
password: pw, $div.empty();
}, waitFor(function () { // TODO
$div.empty(); // Accept/decline/decide later UI
// TODO }));
// Accept/decline/decide later UI });
}));
});
};
$inviteDiv.append(button);
}; };
nThen(function (waitFor) { nThen(function (waitFor) {
@@ -1149,20 +1155,22 @@ define([
if (!password) { return; } if (!password) { return; }
// If there is a password, display the password prompt // If there is a password, display the password prompt
$inviteDiv.append(h('p', 'Please enter the invitation password to continue...')); // XXX
var pwInput = UI.passwordInput(); var pwInput = UI.passwordInput();
var submitPw = h('button.btn.btn-secondary', Messages.password_submit); $(acceptButton).click(function () {
$(submitPw).click(function () {
var val = $(pwInput).find('input').val(); var val = $(pwInput).find('input').val();
if (!val) { return; } if (!val) { return; }
process(val); process(val);
}); });
$inviteDiv.append(pwInput); $inviteDiv.prepend(h('div', [
$inviteDiv.append(submitPw); h('p', 'Please enter the invitation password to continue...'),
pwInput
])); // XXX
waitFor.abort(); waitFor.abort();
}).nThen(function () { }).nThen(function () {
// No password, display the invitation proposal // No password, display the invitation proposal
process(''); $(acceptButton).click(function () {
process('');
});
}); });
}); });