Add character limit to channel header edit modal (#7179)

Этот коммит содержится в:
Joram Wilander
2017-08-11 09:51:40 -04:00
коммит произвёл Saturnino Abril
родитель 48741434aa
Коммит 33d3818e1f
2 изменённых файлов: 9 добавлений и 7 удалений

Просмотреть файл

@@ -85,15 +85,14 @@ class EditChannelHeaderModal extends React.Component {
this.props.channel.id, this.props.channel.id,
this.state.header, this.state.header,
() => { () => {
this.setState({serverError: ''}); this.setState({serverError: '', submitted: false});
this.onHide(); this.onHide();
}, },
(err) => { (err) => {
if (err.id === 'api.context.invalid_param.app_error') { if (err.id === 'api.context.invalid_param.app_error') {
this.setState({serverError: this.props.intl.formatMessage(holders.error)}); this.setState({serverError: this.props.intl.formatMessage(holders.error)});
} else {
this.setState({serverError: err.message});
} }
this.setState({submitted: false});
} }
); );
} }
@@ -189,6 +188,7 @@ class EditChannelHeaderModal extends React.Component {
handlePostError={this.handlePostError} handlePostError={this.handlePostError}
id='edit_textbox' id='edit_textbox'
ref='editChannelHeaderTextbox' ref='editChannelHeaderTextbox'
characterLimit={1024}
/> />
<br/> <br/>
{serverError} {serverError}

Просмотреть файл

@@ -38,13 +38,15 @@ export default class Textbox extends React.Component {
suggestionListStyle: PropTypes.string, suggestionListStyle: PropTypes.string,
emojiEnabled: PropTypes.bool, emojiEnabled: PropTypes.bool,
isRHS: PropTypes.bool, isRHS: PropTypes.bool,
popoverMentionKeyClick: React.PropTypes.bool popoverMentionKeyClick: React.PropTypes.bool,
characterLimit: React.PropTypes.number
}; };
static defaultProps = { static defaultProps = {
supportsCommands: true, supportsCommands: true,
isRHS: false, isRHS: false,
popoverMentionKeyClick: false popoverMentionKeyClick: false,
characterLimit: Constants.CHARACTER_LIMIT
}; };
constructor(props) { constructor(props) {
@@ -93,14 +95,14 @@ export default class Textbox extends React.Component {
checkMessageLength = (message) => { checkMessageLength = (message) => {
if (this.props.handlePostError) { if (this.props.handlePostError) {
if (message.length > Constants.CHARACTER_LIMIT) { if (message.length > this.props.characterLimit) {
const errorMessage = ( const errorMessage = (
<FormattedMessage <FormattedMessage
id='create_post.error_message' id='create_post.error_message'
defaultMessage='Your message is too long. Character count: {length}/{limit}' defaultMessage='Your message is too long. Character count: {length}/{limit}'
values={{ values={{
length: message.length, length: message.length,
limit: Constants.CHARACTER_LIMIT limit: this.props.characterLimit
}} }}
/>); />);
this.props.handlePostError(errorMessage); this.props.handlePostError(errorMessage);