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

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

Browse source
This commit is contained in:
David Baker 2018-04-30 14:06:32 +01:00
commit dcaacfd204
7 changed files with 428 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/components/views/dialogs/BaseDialog.js
View file

@ -37,9 +37,9 @@ export default React.createClass({
propTypes: {
// onFinished callback to call when Escape is pressed
// Take a boolean which is true is the dialog was dismissed
// Take a boolean which is true if the dialog was dismissed
// with a positive / confirm action or false if it was
// cancelled (from BaseDialog, this is always false).
// cancelled (BaseDialog itself only calls this with false).
onFinished: PropTypes.func.isRequired,
// Whether the dialog should have a 'close' button that will