summaryrefslogtreecommitdiffstats
path: root/webapp
diff options
context:
space:
mode:
authorChristopher Speller <crspeller@gmail.com>2016-09-22 17:26:28 -0400
committerGitHub <noreply@github.com>2016-09-22 17:26:28 -0400
commit6d62d65b2dc85855aabea036cbd44f6059e19d13 (patch)
tree37116d9e16c2f457b6c5a30d291c004d4a3a86a6 /webapp
parent353761b917a5be34cb519e9ca86d316747c6a9f7 (diff)
downloadchat-6d62d65b2dc85855aabea036cbd44f6059e19d13.tar.gz
chat-6d62d65b2dc85855aabea036cbd44f6059e19d13.tar.bz2
chat-6d62d65b2dc85855aabea036cbd44f6059e19d13.zip
Fixing build failure caused by dependancies updating (#4076)
Diffstat (limited to 'webapp')
-rw-r--r--webapp/components/edit_channel_purpose_modal.jsx15
-rw-r--r--webapp/components/error_bar.jsx2
-rw-r--r--webapp/components/rename_channel_modal.jsx2
3 files changed, 4 insertions, 15 deletions
diff --git a/webapp/components/edit_channel_purpose_modal.jsx b/webapp/components/edit_channel_purpose_modal.jsx
index 664a94cf2..57d3b78a9 100644
--- a/webapp/components/edit_channel_purpose_modal.jsx
+++ b/webapp/components/edit_channel_purpose_modal.jsx
@@ -6,16 +6,10 @@ import ReactDOM from 'react-dom';
import * as AsyncClient from 'utils/async_client.jsx';
import Client from 'client/web_client.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 {Modal} from 'react-bootstrap';
-
-const holders = defineMessages({
- error: {
- id: 'edit_channel_purpose_modal.error',
- defaultMessage: 'This channel purpose is too long, please enter a shorter one'
- }
-});
+import * as Utils from 'utils/utils.jsx';
import React from 'react';
@@ -89,7 +83,7 @@ export default class EditChannelPurposeModal extends React.Component {
},
(err) => {
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 {
this.setState({serverError: err.message});
}
@@ -208,10 +202,7 @@ export default class EditChannelPurposeModal extends React.Component {
}
EditChannelPurposeModal.propTypes = {
- intl: intlShape.isRequired,
show: React.PropTypes.bool.isRequired,
channel: React.PropTypes.object,
onModalDismissed: React.PropTypes.func.isRequired
};
-
-export default injectIntl(EditChannelPurposeModal); \ No newline at end of file
diff --git a/webapp/components/error_bar.jsx b/webapp/components/error_bar.jsx
index affaf6f5d..5fd12afc4 100644
--- a/webapp/components/error_bar.jsx
+++ b/webapp/components/error_bar.jsx
@@ -136,5 +136,3 @@ export default class ErrorBar extends React.Component {
);
}
}
-
-export default ErrorBar;
diff --git a/webapp/components/rename_channel_modal.jsx b/webapp/components/rename_channel_modal.jsx
index 46dbe1b89..794177373 100644
--- a/webapp/components/rename_channel_modal.jsx
+++ b/webapp/components/rename_channel_modal.jsx
@@ -44,7 +44,7 @@ const holders = defineMessages({
import React from 'react';
-export default class RenameChannelModal extends React.Component {
+export class RenameChannelModal extends React.Component {
constructor(props) {
super(props);