imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Weblate 2018-11-23 11:19:28 +00:00
commit 25a4aaf749
3 changed files with 15 additions and 7 deletions
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() { _onResetRecoveryClick: function() {
this.props.onFinished(false); this.props.onFinished(false);
const CreateKeyBackupDialog = sdk.getComponent("dialogs.keybackup.CreateKeyBackupDialog"); Modal.createTrackedDialogAsync('Key Backup', 'Key Backup',
Modal.createTrackedDialog('Create Key Backup', '', CreateKeyBackupDialog, {}); import('../../../../async-components/views/dialogs/keybackup/CreateKeyBackupDialog'),
{
onFinished: () => {
this._loadBackupStatus();
},
},
);
}, },
_onRecoveryKeyChange: function(e) { _onRecoveryKeyChange: function(e) {

12
src/components/views/settings/KeyBackupPanel.js
View file

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