diff options
author | Corey Hulen <corey@hulen.com> | 2016-01-25 20:59:01 -0500 |
---|---|---|
committer | Corey Hulen <corey@hulen.com> | 2016-01-25 20:59:01 -0500 |
commit | c44048e5f95b4be43443761c2d7645fee456897c (patch) | |
tree | 2694d508473fa5c66a841743b9e92fb0b2155e58 /web/react/components | |
parent | 2a29232185ed169a9e63e479b7eb67f289be7b68 (diff) | |
parent | 64247fd18c915bda5a2c00e61f0880f153e76235 (diff) | |
download | chat-c44048e5f95b4be43443761c2d7645fee456897c.tar.gz chat-c44048e5f95b4be43443761c2d7645fee456897c.tar.bz2 chat-c44048e5f95b4be43443761c2d7645fee456897c.zip |
Merge pull request #1985 from mattermost/PLT-7-client-infra5
PLT-7 fixing error bar msg
Diffstat (limited to 'web/react/components')
-rw-r--r-- | web/react/components/error_bar.jsx | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/web/react/components/error_bar.jsx b/web/react/components/error_bar.jsx index 921e8afe1..e93545c25 100644 --- a/web/react/components/error_bar.jsx +++ b/web/react/components/error_bar.jsx @@ -13,6 +13,12 @@ export default class ErrorBar extends React.Component { this.state = ErrorStore.getLastError(); } + static propTypes() { + return { + intl: ReactIntl.intlShape.isRequired + }; + } + isValidError(s) { if (!s) { return false; @@ -41,6 +47,18 @@ export default class ErrorBar extends React.Component { return false; } + componentWillMount() { + if (global.window.mm_config.SendEmailNotifications === 'false') { + ErrorStore.storeLastError({message: this.props.intl.formatMessage( + { + id: 'error_bar.preview_mode', + defaultMessage: 'Preview Mode: Email notifications have not been configured' + } + )}); + this.onErrorChange(); + } + } + componentDidMount() { ErrorStore.addChangeListener(this.onErrorChange); } @@ -86,3 +104,5 @@ export default class ErrorBar extends React.Component { ); } } + +export default ReactIntl.injectIntl(ErrorBar); |