summaryrefslogtreecommitdiffstats
path: root/web
diff options
context:
space:
mode:
authorJoram Wilander <jwawilander@gmail.com>2015-10-26 15:01:41 -0400
committerJoram Wilander <jwawilander@gmail.com>2015-10-26 15:01:41 -0400
commit2680b81568ca3f8eac1d5937f85085f1785eb84d (patch)
tree952e1671d8d918fca49f1a3d35c8b4beb3348a24 /web
parentb826d094808ec27622b8c22a03195f36db86792b (diff)
parent6d957a26d884cd2ff200a4d14b035bc03415cab6 (diff)
downloadchat-2680b81568ca3f8eac1d5937f85085f1785eb84d.tar.gz
chat-2680b81568ca3f8eac1d5937f85085f1785eb84d.tar.bz2
chat-2680b81568ca3f8eac1d5937f85085f1785eb84d.zip
Merge pull request #1191 from mattermost/PLT-564
PLT-564 removing auto-hide from error bar
Diffstat (limited to 'web')
-rw-r--r--web/react/components/error_bar.jsx12
1 files changed, 0 insertions, 12 deletions
diff --git a/web/react/components/error_bar.jsx b/web/react/components/error_bar.jsx
index 6311d9460..f098384aa 100644
--- a/web/react/components/error_bar.jsx
+++ b/web/react/components/error_bar.jsx
@@ -9,12 +9,8 @@ export default class ErrorBar extends React.Component {
this.onErrorChange = this.onErrorChange.bind(this);
this.handleClose = this.handleClose.bind(this);
- this.prevTimer = null;
this.state = ErrorStore.getLastError();
- if (this.isValidError(this.state)) {
- this.prevTimer = setTimeout(this.handleClose, 10000);
- }
}
isValidError(s) {
@@ -56,16 +52,8 @@ export default class ErrorBar extends React.Component {
onErrorChange() {
var newState = ErrorStore.getLastError();
- if (this.prevTimer != null) {
- clearInterval(this.prevTimer);
- this.prevTimer = null;
- }
-
if (newState) {
this.setState(newState);
- if (!this.isConnectionError(newState)) {
- this.prevTimer = setTimeout(this.handleClose, 10000);
- }
} else {
this.setState({message: null});
}