Fixing build failure caused by dependancies updating (#4076)
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
353761b917
Коммит
6d62d65b2d
@@ -6,16 +6,10 @@ import ReactDOM from 'react-dom';
|
|||||||
import * as AsyncClient from 'utils/async_client.jsx';
|
import * as AsyncClient from 'utils/async_client.jsx';
|
||||||
import Client from 'client/web_client.jsx';
|
import Client from 'client/web_client.jsx';
|
||||||
import Constants from 'utils/constants.jsx';
|
import Constants from 'utils/constants.jsx';
|
||||||
import {intlShape, injectIntl, defineMessages, FormattedMessage} from 'react-intl';
|
import {FormattedMessage} from 'react-intl';
|
||||||
import PreferenceStore from 'stores/preference_store.jsx';
|
import PreferenceStore from 'stores/preference_store.jsx';
|
||||||
import {Modal} from 'react-bootstrap';
|
import {Modal} from 'react-bootstrap';
|
||||||
|
import * as Utils from 'utils/utils.jsx';
|
||||||
const holders = defineMessages({
|
|
||||||
error: {
|
|
||||||
id: 'edit_channel_purpose_modal.error',
|
|
||||||
defaultMessage: 'This channel purpose is too long, please enter a shorter one'
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
import React from 'react';
|
import React from 'react';
|
||||||
|
|
||||||
@@ -89,7 +83,7 @@ export default class EditChannelPurposeModal extends React.Component {
|
|||||||
},
|
},
|
||||||
(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: Utils.localizeMessage('edit_channel_puropse_modal.error', 'This channel purpose is too long, please enter a shorter one')});
|
||||||
} else {
|
} else {
|
||||||
this.setState({serverError: err.message});
|
this.setState({serverError: err.message});
|
||||||
}
|
}
|
||||||
@@ -208,10 +202,7 @@ export default class EditChannelPurposeModal extends React.Component {
|
|||||||
}
|
}
|
||||||
|
|
||||||
EditChannelPurposeModal.propTypes = {
|
EditChannelPurposeModal.propTypes = {
|
||||||
intl: intlShape.isRequired,
|
|
||||||
show: React.PropTypes.bool.isRequired,
|
show: React.PropTypes.bool.isRequired,
|
||||||
channel: React.PropTypes.object,
|
channel: React.PropTypes.object,
|
||||||
onModalDismissed: React.PropTypes.func.isRequired
|
onModalDismissed: React.PropTypes.func.isRequired
|
||||||
};
|
};
|
||||||
|
|
||||||
export default injectIntl(EditChannelPurposeModal);
|
|
||||||
@@ -136,5 +136,3 @@ export default class ErrorBar extends React.Component {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
export default ErrorBar;
|
|
||||||
|
|||||||
@@ -44,7 +44,7 @@ const holders = defineMessages({
|
|||||||
|
|
||||||
import React from 'react';
|
import React from 'react';
|
||||||
|
|
||||||
export default class RenameChannelModal extends React.Component {
|
export class RenameChannelModal extends React.Component {
|
||||||
constructor(props) {
|
constructor(props) {
|
||||||
super(props);
|
super(props);
|
||||||
|
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user