Merge pull request #1298 from asaadmahmoodspin/ui-improvements

Multiple UI Improvements

1 files changed, 6 insertions, 0 deletions

diff --git a/web/react/components/rename_channel_modal.jsx b/web/react/components/rename_channel_modal.jsx
index 80f0956f2..9fb3af035 100644
--- a/web/react/components/rename_channel_modal.jsx
+++ b/web/react/components/rename_channel_modal.jsx
@@ -16,6 +16,7 @@ export default class RenameChannelModal extends React.Component {
         this.displayNameKeyUp = this.displayNameKeyUp.bind(this);
         this.handleClose = this.handleClose.bind(this);
         this.handleShow = this.handleShow.bind(this);
+        this.handleShown = this.handleShown.bind(this);
         this.handleSubmit = this.handleSubmit.bind(this);
 
         this.state = {
@@ -118,9 +119,13 @@ export default class RenameChannelModal extends React.Component {
         const button = $(e.relatedTarget);
         this.setState({displayName: button.attr('data-display'), channelName: button.attr('data-name'), channelId: button.attr('data-channelid')});
     }
+    handleShown() {
+        $('#rename_channel #display_name').focus();
+    }
     componentDidMount() {
         $(ReactDOM.findDOMNode(this.refs.modal)).on('show.bs.modal', this.handleShow);
         $(ReactDOM.findDOMNode(this.refs.modal)).on('hidden.bs.modal', this.handleClose);
+        $(ReactDOM.findDOMNode(this.refs.modal)).on('shown.bs.modal', this.handleShown);
     }
     componentWillUnmount() {
         $(ReactDOM.findDOMNode(this.refs.modal)).off('hidden.bs.modal', this.handleClose);
@@ -176,6 +181,7 @@ export default class RenameChannelModal extends React.Component {
                                         onChange={this.onDisplayNameChange}
                                         type='text'
                                         ref='displayName'
+                                        id='display_name'
                                         className='form-control'
                                         placeholder='Enter display name'
                                         value={this.state.displayName}