switch to controlled inputs and require eventType !== ''

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
pull/5074/head
Michael Telatynski 2017-09-18 11:06:46 +01:00
parent 828e9d5eb4
commit 821ab6c13e
No known key found for this signature in database
GPG Key ID: 3F879DA5AD802A5E
1 changed files with 29 additions and 12 deletions

View File

@ -29,11 +29,14 @@ class SendCustomEvent extends React.Component {
super(props, context); super(props, context);
this._send = this._send.bind(this); this._send = this._send.bind(this);
this.onBack = this.onBack.bind(this); this.onBack = this.onBack.bind(this);
} this._onChange = this._onChange.bind(this);
state = { this.state = {
message: null, message: null,
}; input_eventType: '',
input_evContent: '{\n\n}',
};
}
onBack() { onBack() {
if (this.state.message) { if (this.state.message) {
@ -51,13 +54,18 @@ class SendCustomEvent extends React.Component {
} }
send(content) { send(content) {
return MatrixClientPeg.get().sendEvent(this.props.roomId, this.refs.eventType.value, content); return MatrixClientPeg.get().sendEvent(this.props.roomId, this.state.input_eventType, content);
} }
async _send() { async _send() {
if (this.state.input_eventType === '') {
this.setState({ message: _t('You must specify an event type!') });
return;
}
let message; let message;
try { try {
const content = JSON.parse(this.refs.evContent.value); const content = JSON.parse(this.state.input_evContent);
await this.send(content); await this.send(content);
message = _t('Event sent!'); message = _t('Event sent!');
} catch (e) { } catch (e) {
@ -67,7 +75,11 @@ class SendCustomEvent extends React.Component {
} }
_additionalFields() { _additionalFields() {
return <div></div>; return <div/>;
}
_onChange(e) {
this.setState({[`input_${e.target.id}`]: e.target.value});
} }
render() { render() {
@ -87,14 +99,14 @@ class SendCustomEvent extends React.Component {
<label htmlFor="eventType"> { _t('Event Type') } </label> <label htmlFor="eventType"> { _t('Event Type') } </label>
</div> </div>
<div> <div>
<input id="eventType" ref="eventType" className="mx_TextInputDialog_input" size="64" /> <input id="eventType" onChange={this._onChange} value={this.state.input_eventType} className="mx_TextInputDialog_input" size="64" />
</div> </div>
<div className="mx_TextInputDialog_label"> <div className="mx_TextInputDialog_label">
<label htmlFor="evContent"> { _t('Event Content') } </label> <label htmlFor="evContent"> { _t('Event Content') } </label>
</div> </div>
<div> <div>
<textarea id="evContent" ref="evContent" className="mx_TextInputDialog_input" defaultValue={"{\n\n}"} cols="63" rows="5" /> <textarea id="evContent" onChange={this._onChange} value={this.state.input_evContent} className="mx_TextInputDialog_input" cols="63" rows="5" />
</div> </div>
</div> </div>
{this._buttons()} {this._buttons()}
@ -103,9 +115,14 @@ class SendCustomEvent extends React.Component {
} }
class SendCustomStateEvent extends SendCustomEvent { class SendCustomStateEvent extends SendCustomEvent {
constructor(props, context) {
super(props, context);
this.state['input_stateKey'] = '';
}
send(content) { send(content) {
return MatrixClientPeg.get().sendStateEvent(this.props.roomId, this.refs.eventType.value, content, const cli = MatrixClientPeg.get();
this.refs.stateKey.value); return cli.sendStateEvent(this.props.roomId, this.state.input_eventType, content, this.state.input_stateKey);
} }
_additionalFields() { _additionalFields() {
@ -114,7 +131,7 @@ class SendCustomStateEvent extends SendCustomEvent {
<label htmlFor="stateKey"> { _t('State Key') } </label> <label htmlFor="stateKey"> { _t('State Key') } </label>
</div> </div>
<div> <div>
<input id="stateKey" ref="stateKey" className="mx_TextInputDialog_input" size="64" /> <input id="stateKey" onChange={this._onChange} value={this.state.input_stateKey} className="mx_TextInputDialog_input" size="64" />
</div> </div>
</div>; </div>;
} }