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

Merge branch 'inviteUI_design' into inviteUI

Browse source
This commit is contained in:
David Benqué 2019-12-17 10:52:18 +00:00
commit 5302077be1
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
customize.dist/src/less2/include/alertify.less
View file

@ -375,8 +375,8 @@
text-align: right;
button {
margin: 0px !important;
&:not(:last-child) {
margin-right: @alertify_padding-base !important;
&:not(:first-child) {
margin-left: @alertify_padding-base !important;
}
}
}

7
www/common/common-ui-elements.js
View file

@ -1718,7 +1718,8 @@ define([
NThen(function (waitFor) {
$(linkForm).hide();
$(linkSpin).show();
$nav.find('button.cp-teams-invite-create').prop('disabled', 'disabled');
$nav.find('button.cp-teams-invite-create').hide();
$nav.find('button.cp-teams-invite-copy').show()
setTimeout(waitFor(), 150);
}).nThen(function (waitFor) {
InviteInner.deriveBytes(seeds.scrypt, salt, waitFor(function (_bytes) {
@ -1738,7 +1739,7 @@ define([
if (obj && obj.error) {
waitFor.abort();
$(linkSpin).hide();
return void $(linkError).text('ERROR '+obj.error).show(); // XXX
return void $(linkError).text(Messages.team_inviteLinkError+obj.error).show(); // XXX
}
// Display result here
$(linkSpin).hide();
@ -1774,7 +1775,7 @@ define([
var frameLink = UI.dialog.customModal(linkContent, {
buttons: linkButtons,
});
$(frameLink).find('.cp-teams-invite-copy').prop('disabled', 'disabled');
$(frameLink).find('.cp-teams-invite-copy').prop('disabled', 'disabled').hide();
// Create modal
var tabs = [{