From 6c3a1d7039febd991db76dc176e9e57fd48ab9a4 Mon Sep 17 00:00:00 2001
From: hmhealey <harrisonmhealey@gmail.com>
Date: Mon, 16 Nov 2015 12:14:03 -0500
Subject: Renamed EditChannelModal to EditChannelHeaderModal

---
 web/react/components/channel_header.jsx            |   6 +-
 web/react/components/edit_channel_header_modal.jsx | 126 +++++++++++++++++++++
 web/react/components/edit_channel_modal.jsx        | 126 ---------------------
 web/react/components/navbar.jsx                    |   4 +-
 4 files changed, 131 insertions(+), 131 deletions(-)
 create mode 100644 web/react/components/edit_channel_header_modal.jsx
 delete mode 100644 web/react/components/edit_channel_modal.jsx

(limited to 'web/react/components')

diff --git a/web/react/components/channel_header.jsx b/web/react/components/channel_header.jsx
index 06d5db8b0..6e12c7c14 100644
--- a/web/react/components/channel_header.jsx
+++ b/web/react/components/channel_header.jsx
@@ -4,7 +4,7 @@
 import NavbarSearchBox from './search_bar.jsx';
 import MessageWrapper from './message_wrapper.jsx';
 import PopoverListMembers from './popover_list_members.jsx';
-import EditChannelModal from './edit_channel_modal.jsx';
+import EditChannelHeaderModal from './edit_channel_header_modal.jsx';
 import EditChannelPurposeModal from './edit_channel_purpose_modal.jsx';
 import ChannelInfoModal from './channel_info_modal.jsx';
 import ChannelInviteModal from './channel_invite_modal.jsx';
@@ -170,7 +170,7 @@ export default class ChannelHeader extends React.Component {
                 >
                     <ToggleModalButton
                         role='menuitem'
-                        dialogType={EditChannelModal}
+                        dialogType={EditChannelHeaderModal}
                         dialogProps={{channel}}
                     >
                         {'Set Channel Header...'}
@@ -234,7 +234,7 @@ export default class ChannelHeader extends React.Component {
                 >
                     <ToggleModalButton
                         role='menuitem'
-                        dialogType={EditChannelModal}
+                        dialogType={EditChannelHeaderModal}
                         dialogProps={{channel}}
                     >
                         {`Set ${channelTerm} Header...`}
diff --git a/web/react/components/edit_channel_header_modal.jsx b/web/react/components/edit_channel_header_modal.jsx
new file mode 100644
index 000000000..5529a419d
--- /dev/null
+++ b/web/react/components/edit_channel_header_modal.jsx
@@ -0,0 +1,126 @@
+// Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
+// See License.txt for license information.
+
+import * as Client from '../utils/client.jsx';
+import * as AsyncClient from '../utils/async_client.jsx';
+import * as Utils from '../utils/utils.jsx';
+
+const Modal = ReactBootstrap.Modal;
+
+export default class EditChannelHeaderModal extends React.Component {
+    constructor(props) {
+        super(props);
+
+        this.handleEdit = this.handleEdit.bind(this);
+
+        this.onShow = this.onShow.bind(this);
+        this.onHide = this.onHide.bind(this);
+
+        this.state = {
+            serverError: ''
+        };
+    }
+
+    componentDidMount() {
+        if (this.props.show) {
+            this.onShow();
+        }
+    }
+
+    componentDidUpdate(prevProps) {
+        if (this.props.show && !prevProps.show) {
+            this.onShow();
+        }
+    }
+
+    handleEdit() {
+        var data = {};
+        data.channel_id = this.props.channel.id;
+
+        if (data.channel_id.length !== 26) {
+            return;
+        }
+
+        data.channel_header = ReactDOM.findDOMNode(this.refs.textarea).value;
+
+        Client.updateChannelHeader(data,
+            () => {
+                this.setState({serverError: ''});
+                AsyncClient.getChannel(this.props.channel.id);
+                this.onHide();
+            },
+            (err) => {
+                if (err.message === 'Invalid channel_header parameter') {
+                    this.setState({serverError: 'This channel header is too long, please enter a shorter one'});
+                } else {
+                    this.setState({serverError: err.message});
+                }
+            }
+        );
+    }
+
+    onShow() {
+        const textarea = ReactDOM.findDOMNode(this.refs.textarea);
+        Utils.placeCaretAtEnd(textarea);
+    }
+
+    onHide() {
+        this.setState({
+            serverError: ''
+        });
+
+        this.props.onHide();
+    }
+
+    render() {
+        var serverError = null;
+        if (this.state.serverError) {
+            serverError = <div className='form-group has-error'><br/><label className='control-label'>{this.state.serverError}</label></div>;
+        }
+
+        return (
+            <Modal
+                show={this.props.show}
+                onHide={this.onHide}
+            >
+                <Modal.Header closeButton={true}>
+                    {'Edit Header for ' + this.props.channel.display_name}
+                </Modal.Header>
+                <Modal.Body>
+                    <p>{'Edit the text appearing next to the channel name in the channel header.'}</p>
+                    <textarea
+                        ref='textarea'
+                        className='form-control no-resize'
+                        rows='6'
+                        id='edit_header'
+                        maxLength='1024'
+                        defaultValue={this.props.channel.header}
+                    />
+                    {serverError}
+                </Modal.Body>
+                <Modal.Footer>
+                    <button
+                        type='button'
+                        className='btn btn-default'
+                        onClick={this.props.onHide}
+                    >
+                        {'Cancel'}
+                    </button>
+                    <button
+                        type='button'
+                        className='btn btn-primary'
+                        onClick={this.handleEdit}
+                    >
+                        {'Save'}
+                    </button>
+                </Modal.Footer>
+            </Modal>
+        );
+    }
+}
+
+EditChannelHeaderModal.propTypes = {
+    show: React.PropTypes.bool.isRequired,
+    onHide: React.PropTypes.func.isRequired,
+    channel: React.PropTypes.object.isRequired
+};
diff --git a/web/react/components/edit_channel_modal.jsx b/web/react/components/edit_channel_modal.jsx
deleted file mode 100644
index 487ae6964..000000000
--- a/web/react/components/edit_channel_modal.jsx
+++ /dev/null
@@ -1,126 +0,0 @@
-// Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
-// See License.txt for license information.
-
-import * as Client from '../utils/client.jsx';
-import * as AsyncClient from '../utils/async_client.jsx';
-import * as Utils from '../utils/utils.jsx';
-
-const Modal = ReactBootstrap.Modal;
-
-export default class EditChannelModal extends React.Component {
-    constructor(props) {
-        super(props);
-
-        this.handleEdit = this.handleEdit.bind(this);
-
-        this.onShow = this.onShow.bind(this);
-        this.onHide = this.onHide.bind(this);
-
-        this.state = {
-            serverError: ''
-        };
-    }
-
-    componentDidMount() {
-        if (this.props.show) {
-            this.onShow();
-        }
-    }
-
-    componentDidUpdate(prevProps) {
-        if (this.props.show && !prevProps.show) {
-            this.onShow();
-        }
-    }
-
-    handleEdit() {
-        var data = {};
-        data.channel_id = this.props.channel.id;
-
-        if (data.channel_id.length !== 26) {
-            return;
-        }
-
-        data.channel_header = ReactDOM.findDOMNode(this.refs.textarea).value;
-
-        Client.updateChannelHeader(data,
-            () => {
-                this.setState({serverError: ''});
-                AsyncClient.getChannel(this.props.channel.id);
-                this.onHide();
-            },
-            (err) => {
-                if (err.message === 'Invalid channel_header parameter') {
-                    this.setState({serverError: 'This channel header is too long, please enter a shorter one'});
-                } else {
-                    this.setState({serverError: err.message});
-                }
-            }
-        );
-    }
-
-    onShow() {
-        const textarea = ReactDOM.findDOMNode(this.refs.textarea);
-        Utils.placeCaretAtEnd(textarea);
-    }
-
-    onHide() {
-        this.setState({
-            serverError: ''
-        });
-
-        this.props.onHide();
-    }
-
-    render() {
-        var serverError = null;
-        if (this.state.serverError) {
-            serverError = <div className='form-group has-error'><br/><label className='control-label'>{this.state.serverError}</label></div>;
-        }
-
-        return (
-            <Modal
-                show={this.props.show}
-                onHide={this.onHide}
-            >
-                <Modal.Header closeButton={true}>
-                    {'Edit Header for ' + this.props.channel.display_name}
-                </Modal.Header>
-                <Modal.Body>
-                    <p>{'Edit the text appearing next to the channel name in the channel header.'}</p>
-                    <textarea
-                        ref='textarea'
-                        className='form-control no-resize'
-                        rows='6'
-                        id='edit_header'
-                        maxLength='1024'
-                        defaultValue={this.props.channel.header}
-                    />
-                    {serverError}
-                </Modal.Body>
-                <Modal.Footer>
-                    <button
-                        type='button'
-                        className='btn btn-default'
-                        onClick={this.props.onHide}
-                    >
-                        {'Cancel'}
-                    </button>
-                    <button
-                        type='button'
-                        className='btn btn-primary'
-                        onClick={this.handleEdit}
-                    >
-                        {'Save'}
-                    </button>
-                </Modal.Footer>
-            </Modal>
-        );
-    }
-}
-
-EditChannelModal.propTypes = {
-    show: React.PropTypes.bool.isRequired,
-    onHide: React.PropTypes.func.isRequired,
-    channel: React.PropTypes.object.isRequired
-};
diff --git a/web/react/components/navbar.jsx b/web/react/components/navbar.jsx
index 8d3d779f3..03cc75a08 100644
--- a/web/react/components/navbar.jsx
+++ b/web/react/components/navbar.jsx
@@ -1,7 +1,7 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-import EditChannelModal from './edit_channel_modal.jsx';
+import EditChannelHeaderModal from './edit_channel_header_modal.jsx';
 import EditChannelPurposeModal from './edit_channel_purpose_modal.jsx';
 import MessageWrapper from './message_wrapper.jsx';
 import NotifyCounts from './notify_counts.jsx';
@@ -426,7 +426,7 @@ export default class Navbar extends React.Component {
             }
 
             editChannelHeaderModal = (
-                <EditChannelModal
+                <EditChannelHeaderModal
                     show={this.state.showEditChannelHeaderModal}
                     onHide={() => this.setState({showEditChannelHeaderModal: false})}
                     channel={channel}
-- 
cgit v1.2.3-1-g7c22