From 3a6694cc6b52ba0022a92373df9f07b7bf080240 Mon Sep 17 00:00:00 2001 From: enahum Date: Tue, 7 Jun 2016 18:43:36 -0300 Subject: PLT-3203 Commenting on the RHS while in permalink view makes the message not show up in the RHS (#3282) --- webapp/stores/post_store.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'webapp/stores') diff --git a/webapp/stores/post_store.jsx b/webapp/stores/post_store.jsx index 062997f2b..b5e73b6b4 100644 --- a/webapp/stores/post_store.jsx +++ b/webapp/stores/post_store.jsx @@ -551,7 +551,7 @@ PostStore.dispatchToken = AppDispatcher.register((payload) => { switch (action.type) { case ActionTypes.RECEIVED_POSTS: { - const id = PostStore.currentFocusedPostId == null ? action.id : PostStore.currentFocusedPostId; + const id = PostStore.currentFocusedPostId !== null && action.isPost ? PostStore.currentFocusedPostId : action.id; PostStore.storePosts(id, makePostListNonNull(action.post_list)); PostStore.checkBounds(id, action.numRequested, makePostListNonNull(action.post_list), action.before); PostStore.emitChange(); -- cgit v1.2.3-1-g7c22 From 6f490b49c2a01a6a873f8fa781a796b6f697ced1 Mon Sep 17 00:00:00 2001 From: enahum Date: Thu, 9 Jun 2016 12:12:32 -0300 Subject: PLT-3254 Javascript error and can't login with Spanish Client language (#3298) --- webapp/stores/user_store.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'webapp/stores') diff --git a/webapp/stores/user_store.jsx b/webapp/stores/user_store.jsx index f57ecf1cd..218a7f1db 100644 --- a/webapp/stores/user_store.jsx +++ b/webapp/stores/user_store.jsx @@ -104,7 +104,7 @@ class UserStoreClass extends EventEmitter { this.currentUserId = user.id; global.window.mm_current_user_id = this.currentUserId; if (LocalizationStore.getLocale() !== user.locale) { - GlobalActions.newLocalizationSelected(user.locale); + setTimeout(() => GlobalActions.newLocalizationSelected(user.locale), 0); } } -- cgit v1.2.3-1-g7c22