Rebase AddressSelector on BaseDialog

pull/21833/head
Aidan Gauland 2017-12-18 22:36:12 +13:00
parent b5f6d97fa2
commit 8bb16466d6
1 changed files with 4 additions and 11 deletions

View File

@ -20,7 +20,6 @@ import PropTypes from 'prop-types';
import { _t } from '../../../languageHandler'; import { _t } from '../../../languageHandler';
import sdk from '../../../index'; import sdk from '../../../index';
import MatrixClientPeg from '../../../MatrixClientPeg'; import MatrixClientPeg from '../../../MatrixClientPeg';
import AccessibleButton from '../elements/AccessibleButton';
import Promise from 'bluebird'; import Promise from 'bluebird';
import { addressTypes, getAddressType } from '../../../UserAddress.js'; import { addressTypes, getAddressType } from '../../../UserAddress.js';
import GroupStoreCache from '../../../stores/GroupStoreCache'; import GroupStoreCache from '../../../stores/GroupStoreCache';
@ -507,7 +506,7 @@ module.exports = React.createClass({
}, },
render: function() { render: function() {
const TintableSvg = sdk.getComponent("elements.TintableSvg"); const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
const AddressSelector = sdk.getComponent("elements.AddressSelector"); const AddressSelector = sdk.getComponent("elements.AddressSelector");
this.scrollElement = null; this.scrollElement = null;
@ -580,14 +579,8 @@ module.exports = React.createClass({
} }
return ( return (
<div className="mx_ChatInviteDialog" onKeyDown={this.onKeyDown}> <BaseDialog className="mx_ChatInviteDialog" onKeyDown={this.onKeyDown}
<div className="mx_Dialog_title"> onFinished={this.props.onFinished} title={this.props.title}>
{ this.props.title }
</div>
<AccessibleButton className="mx_ChatInviteDialog_cancel"
onClick={this.onCancel} >
<TintableSvg src="img/icons-close-button.svg" width="35" height="35" />
</AccessibleButton>
<div className="mx_ChatInviteDialog_label"> <div className="mx_ChatInviteDialog_label">
<label htmlFor="textinput">{ this.props.description }</label> <label htmlFor="textinput">{ this.props.description }</label>
</div> </div>
@ -602,7 +595,7 @@ module.exports = React.createClass({
{ this.props.button } { this.props.button }
</button> </button>
</div> </div>
</div> </BaseDialog>
); );
}, },
}); });