OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

pull/21833/head
Weblate 2018-11-23 11:19:28 +00:00
parent 02d950bd59 0c6e98548e
commit 25a4aaf749
3 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
src/components/views/dialogs/keybackup/CreateKeyBackupDialog.js → src/async-components/views/dialogs/keybackup/CreateKeyBackupDialog.js
View File

10
src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js
View File

@ -59,8 +59,14 @@ export default React.createClass({
_onResetRecoveryClick: function() {
this.props.onFinished(false);
const CreateKeyBackupDialog = sdk.getComponent("dialogs.keybackup.CreateKeyBackupDialog");
Modal.createTrackedDialog('Create Key Backup', '', CreateKeyBackupDialog, {});
Modal.createTrackedDialogAsync('Key Backup', 'Key Backup',
import('../../../../async-components/views/dialogs/keybackup/CreateKeyBackupDialog'),
{
onFinished: () => {
this._loadBackupStatus();
},
},
);
},
_onRecoveryKeyChange: function(e) {

8
src/components/views/settings/KeyBackupPanel.js
View File

@ -80,12 +80,14 @@ export default class KeyBackupPanel extends React.Component {
}
_startNewBackup() {
const CreateKeyBackupDialog = sdk.getComponent('dialogs.keybackup.CreateKeyBackupDialog');
Modal.createTrackedDialog('Key Backup', 'Key Backup', CreateKeyBackupDialog, {
Modal.createTrackedDialogAsync('Key Backup', 'Key Backup',
import('../../../async-components/views/dialogs/keybackup/CreateKeyBackupDialog'),
{
onFinished: () => {
this._loadBackupStatus();
},
});
},
);
}
_deleteBackup() {