diff options
author | David Meza <dmeza@users.noreply.github.com> | 2017-08-01 07:12:25 -0500 |
---|---|---|
committer | George Goldberg <george@gberg.me> | 2017-08-01 13:12:25 +0100 |
commit | b023b891550cd8fb2f874e822f05921d13f51fb2 (patch) | |
tree | b347516f83cc152da05e297c4b702e225e3eb3bc /webapp/components | |
parent | 00e8b6621a7ddf13222144d4acf80421204a23cc (diff) | |
download | chat-b023b891550cd8fb2f874e822f05921d13f51fb2.tar.gz chat-b023b891550cd8fb2f874e822f05921d13f51fb2.tar.bz2 chat-b023b891550cd8fb2f874e822f05921d13f51fb2.zip |
Use Constants.MAX_CHANNELNAME_LENGTH where a fixed number like 22 or 64 is used for max length of channel names. (#7041)
Diffstat (limited to 'webapp/components')
-rw-r--r-- | webapp/components/change_url_modal.jsx | 2 | ||||
-rw-r--r-- | webapp/components/rename_channel_modal.jsx | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/webapp/components/change_url_modal.jsx b/webapp/components/change_url_modal.jsx index a94a33ad3..88304a4a7 100644 --- a/webapp/components/change_url_modal.jsx +++ b/webapp/components/change_url_modal.jsx @@ -191,7 +191,7 @@ export default class ChangeUrlModal extends React.Component { type='text' ref='urlinput' className='form-control' - maxLength='22' + maxLength={Constants.MAX_CHANNELNAME_LENGTH} onChange={this.onURLChanged} value={this.state.currentURL} autoFocus={true} diff --git a/webapp/components/rename_channel_modal.jsx b/webapp/components/rename_channel_modal.jsx index d4cddb9db..8d36e15c7 100644 --- a/webapp/components/rename_channel_modal.jsx +++ b/webapp/components/rename_channel_modal.jsx @@ -21,7 +21,7 @@ const holders = defineMessages({ }, maxLength: { id: 'rename_channel.maxLength', - defaultMessage: 'This field must be less than 22 characters' + defaultMessage: 'This field must be less than {maxLength, number} characters' }, lowercase: { id: 'rename_channel.lowercase', @@ -136,8 +136,8 @@ export class RenameChannelModal extends React.Component { if (!channel.display_name) { state.displayNameError = formatMessage(holders.required); state.invalid = true; - } else if (channel.display_name.length > 22) { - state.displayNameError = formatMessage(holders.maxLength); + } else if (channel.display_name.length > Constants.MAX_CHANNELNAME_LENGTH) { + state.displayNameError = formatMessage(holders.maxLength, {maxLength: Constants.MAX_CHANNELNAME_LENGTH}); state.invalid = true; } else { state.displayNameError = ''; @@ -147,8 +147,8 @@ export class RenameChannelModal extends React.Component { if (!channel.name) { state.nameError = formatMessage(holders.required); state.invalid = true; - } else if (channel.name.length > 22) { - state.nameError = formatMessage(holders.maxLength); + } else if (channel.name.length > Constants.MAX_CHANNELNAME_LENGTH) { + state.nameError = formatMessage(holders.maxLength, {maxLength: Constants.MAX_CHANNELNAME_LENGTH}); state.invalid = true; } else { const cleanedName = cleanUpUrlable(channel.name); @@ -264,7 +264,7 @@ export class RenameChannelModal extends React.Component { className='form-control' placeholder={formatMessage(holders.displayNameHolder)} value={this.state.displayName} - maxLength='64' + maxLength={Constants.MAX_CHANNELNAME_LENGTH} /> {displayNameError} </div> @@ -287,7 +287,7 @@ export class RenameChannelModal extends React.Component { ref='channelName' placeholder={formatMessage(holders.handleHolder)} value={this.state.channelName} - maxLength='64' + maxLength={Constants.MAX_CHANNELNAME_LENGTH} readOnly={readOnlyHandleInput} /> </div> |