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

Merge pull request #648 from matrix-org/rav/fix_set_displayname 

Fix SetDisplayNameDialog
pull/21833/head
David Baker 2017-01-25 14:32:52 +00:00 committed by GitHub
parent f66e412d3a 29b4dde878
commit e567162d28
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/components/structures/RoomView.js
View File

@ -722,15 +722,11 @@ module.exports = React.createClass({
if (!result.displayname) { if (!result.displayname) {
var SetDisplayNameDialog = sdk.getComponent('views.dialogs.SetDisplayNameDialog'); var SetDisplayNameDialog = sdk.getComponent('views.dialogs.SetDisplayNameDialog');
var dialog_defer = q.defer(); var dialog_defer = q.defer();
var dialog_ref;
Modal.createDialog(SetDisplayNameDialog, { Modal.createDialog(SetDisplayNameDialog, {
currentDisplayName: result.displayname, currentDisplayName: result.displayname,
ref: (r) => { onFinished: (submitted, newDisplayName) => {
dialog_ref = r;
},
onFinished: (submitted) => {
if (submitted) { if (submitted) {
cli.setDisplayName(dialog_ref.getValue()).done(() => { cli.setDisplayName(newDisplayName).done(() => {
dialog_defer.resolve(); dialog_defer.resolve();
}); });
} }

12
src/components/views/dialogs/SetDisplayNameDialog.js
View File

@ -18,6 +18,12 @@ var React = require("react");
var sdk = require("../../../index.js"); var sdk = require("../../../index.js");
var MatrixClientPeg = require("../../../MatrixClientPeg"); var MatrixClientPeg = require("../../../MatrixClientPeg");
/**
* Prompt the user to set a display name.
*
* On success, `onFinished(true, newDisplayName)` is called.
*/
module.exports = React.createClass({ module.exports = React.createClass({
displayName: 'SetDisplayNameDialog', displayName: 'SetDisplayNameDialog',
propTypes: { propTypes: {
@ -42,10 +48,6 @@ module.exports = React.createClass({
this.refs.input_value.select(); this.refs.input_value.select();
}, },
getValue: function() {
return this.state.value;
},
onValueChange: function(ev) { onValueChange: function(ev) {
this.setState({ this.setState({
value: ev.target.value value: ev.target.value
@ -54,7 +56,7 @@ module.exports = React.createClass({
onFormSubmit: function(ev) { onFormSubmit: function(ev) {
ev.preventDefault(); ev.preventDefault();
this.props.onFinished(true); this.props.onFinished(true, this.state.value);
return false; return false;
}, },