diff options
-rw-r--r-- | webapp/actions/global_actions.jsx | 12 | ||||
-rw-r--r-- | webapp/client/client.jsx | 2 | ||||
-rw-r--r-- | webapp/components/root.jsx | 6 |
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/>; |