summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoram Wilander <jwawilander@gmail.com>2017-01-03 12:38:51 -0500
committerCorey Hulen <corey@hulen.com>2017-01-03 12:38:51 -0500
commitfba49d1b809077bc4b8e4d8b303e38295151758a (patch)
tree1d8e19a690275b4ff880c3ffeda94503a5eb7a4b
parent2308499fa46a31b455663c164e218a5e3bae6042 (diff)
downloadchat-fba49d1b809077bc4b8e4d8b303e38295151758a.tar.gz
chat-fba49d1b809077bc4b8e4d8b303e38295151758a.tar.bz2
chat-fba49d1b809077bc4b8e4d8b303e38295151758a.zip
Fix console error when logging in with non-english language (#4941)
-rw-r--r--webapp/actions/global_actions.jsx12
-rw-r--r--webapp/client/client.jsx2
-rw-r--r--webapp/components/root.jsx6
3 files changed, 10 insertions, 10 deletions
diff --git a/webapp/actions/global_actions.jsx b/webapp/actions/global_actions.jsx
index 9dd3eff35..c6b796983 100644
--- a/webapp/actions/global_actions.jsx
+++ b/webapp/actions/global_actions.jsx
@@ -190,15 +190,11 @@ export function emitPostFocusEvent(postId, onSuccess) {
}
export function emitCloseRightHandSide() {
- AppDispatcher.handleServerAction({
- type: ActionTypes.RECEIVED_SEARCH,
- results: null
- });
+ SearchStore.storeSearchResults(null, false, false);
+ SearchStore.emitSearchChange();
- AppDispatcher.handleServerAction({
- type: ActionTypes.RECEIVED_POST_SELECTED,
- postId: null
- });
+ PostStore.storeSelectedPostId(null);
+ PostStore.emitSelectedPostChange(false, false);
}
export function emitPostFocusRightHandSideFromSearch(post, isMentionSearch) {
diff --git a/webapp/client/client.jsx b/webapp/client/client.jsx
index 1bbd750c3..5ce3e369d 100644
--- a/webapp/client/client.jsx
+++ b/webapp/client/client.jsx
@@ -162,12 +162,10 @@ export default class Client {
handleResponse(methodName, successCallback, errorCallback, err, res) {
if (res && res.header) {
- this.serverVersion = res.header[HEADER_X_VERSION_ID];
if (res.header[HEADER_X_VERSION_ID]) {
this.serverVersion = res.header[HEADER_X_VERSION_ID];
}
- this.clusterId = res.header[HEADER_X_CLUSTER_ID];
if (res.header[HEADER_X_CLUSTER_ID]) {
this.clusterId = res.header[HEADER_X_CLUSTER_ID];
}
diff --git a/webapp/components/root.jsx b/webapp/components/root.jsx
index 2cfd9d303..be50c7d48 100644
--- a/webapp/components/root.jsx
+++ b/webapp/components/root.jsx
@@ -38,6 +38,7 @@ export default class Root extends React.Component {
// Fastclick
FastClick.attach(document.body);
}
+
localizationChanged() {
const locale = LocalizationStore.getLocale();
@@ -56,13 +57,16 @@ export default class Root extends React.Component {
}
}
}
+
componentWillReceiveProps(newProps) {
this.redirectIfNecessary(newProps);
}
+
componentWillMount() {
// Redirect if Necessary
this.redirectIfNecessary(this.props);
}
+
componentDidMount() {
// Setup localization listener
LocalizationStore.addChangeListener(this.localizationChanged);
@@ -70,9 +74,11 @@ export default class Root extends React.Component {
// Get our localizaiton
GlobalActions.loadDefaultLocale();
}
+
componentWillUnmount() {
LocalizationStore.removeChangeListener(this.localizationChanged);
}
+
render() {
if (this.state.translations == null || this.props.children == null) {
return <div/>;