diff options
-rw-r--r-- | web/react/components/channel_header.jsx | 6 | ||||
-rw-r--r-- | web/react/components/edit_channel_header_modal.jsx (renamed from web/react/components/edit_channel_modal.jsx) | 4 | ||||
-rw-r--r-- | web/react/components/navbar.jsx | 4 | ||||
-rw-r--r-- | web/react/utils/channel_intro_mssages.jsx | 10 |
4 files changed, 12 insertions, 12 deletions
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_modal.jsx b/web/react/components/edit_channel_header_modal.jsx index 487ae6964..5529a419d 100644 --- a/web/react/components/edit_channel_modal.jsx +++ b/web/react/components/edit_channel_header_modal.jsx @@ -7,7 +7,7 @@ import * as Utils from '../utils/utils.jsx'; const Modal = ReactBootstrap.Modal; -export default class EditChannelModal extends React.Component { +export default class EditChannelHeaderModal extends React.Component { constructor(props) { super(props); @@ -119,7 +119,7 @@ export default class EditChannelModal extends React.Component { } } -EditChannelModal.propTypes = { +EditChannelHeaderModal.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} diff --git a/web/react/utils/channel_intro_mssages.jsx b/web/react/utils/channel_intro_mssages.jsx index 4047ec028..268e4f695 100644 --- a/web/react/utils/channel_intro_mssages.jsx +++ b/web/react/utils/channel_intro_mssages.jsx @@ -2,7 +2,7 @@ // See License.txt for license information. import * as Utils from './utils.jsx'; -import EditChannelModal from '../components/edit_channel_modal.jsx'; +import EditChannelHeaderModal from '../components/edit_channel_header_modal.jsx'; import InviteMemberModal from '../components/invite_member_modal.jsx'; import ToggleModalButton from '../components/toggle_modal_button.jsx'; import UserProfile from '../components/user_profile.jsx'; @@ -52,7 +52,7 @@ export function createDMIntroMessage(channel) { </p> <ToggleModalButton className='intro-links' - dialogType={EditChannelModal} + dialogType={EditChannelHeaderModal} dialogProps={{channel}} > <i className='fa fa-pencil'></i>{'Set a header'} @@ -78,7 +78,7 @@ export function createOffTopicIntroMessage(channel, showInviteModal) { </p> <ToggleModalButton className='intro-links' - dialogType={EditChannelModal} + dialogType={EditChannelHeaderModal} dialogProps={{channel}} > <i className='fa fa-pencil'></i>{'Set a header'} @@ -133,7 +133,7 @@ export function createDefaultIntroMessage(channel) { {inviteModalLink} <ToggleModalButton className='intro-links' - dialogType={EditChannelModal} + dialogType={EditChannelHeaderModal} dialogProps={{channel}} > <i className='fa fa-pencil'></i>{'Set a header'} @@ -184,7 +184,7 @@ export function createStandardIntroMessage(channel, showInviteModal) { </p> <ToggleModalButton className='intro-links' - dialogType={EditChannelModal} + dialogType={EditChannelHeaderModal} dialogProps={{channel}} > <i className='fa fa-pencil'></i>{'Set a header'} |