Merge branch 'inviteUI' of github.com:xwiki-labs/cryptpad into inviteUI

This commit is contained in:
ansuz
2019-12-18 12:02:52 -05:00
23 changed files with 604 additions and 200 deletions

View File

@@ -1684,6 +1684,11 @@ define([
dismissButton
]) // XXX
]);
$(linkMessage).keydown(function (e) {
if (e.which === 13) {
e.stopPropagation();
}
});
var localStore = window.cryptpadStore;
localStore.get('hide-alert-teamInvite', function (val) {
if (val === '1') { return; }
@@ -1762,7 +1767,7 @@ define([
onClick: function () {
return process();
},
keys: [13]
keys: []
}, {
className: 'primary cp-teams-invite-copy',
name: Messages.team_inviteLinkCopy, // XXX
@@ -4156,7 +4161,7 @@ define([
};
var content = h('div.cp-share-modal', [
setHTML(h('p'), text)
setHTML(h('p'), text),
]);
UI.proposal(content, todo);
};