Merge branch 'release-2.0'

web/react/components/channel_loader.jsx

@@ -95,6 +95,8 @@ class ChannelLoader extends React.Component {
 
         $(window).on('focus', function windowFocus() {
             AsyncClient.updateLastViewedAt();
+            ChannelStore.resetCounts(ChannelStore.getCurrentId());
+            ChannelStore.emitChange();
             window.isActive = true;
         });
 
@@ -185,4 +187,4 @@ ChannelLoader.propTypes = {
     intl: intlShape.isRequired
 };
 
-export default injectIntl(ChannelLoader);
+export default injectIntl(ChannelLoader);

web/react/stores/channel_store.jsx

@@ -308,7 +308,7 @@ ChannelStore.dispatchToken = AppDispatcher.register((payload) => {
         ChannelStore.storeChannels(action.channels);
         ChannelStore.storeChannelMembers(action.members);
         currentId = ChannelStore.getCurrentId();
-        if (currentId && !document.hidden) {
+        if (currentId && window.isActive) {
             ChannelStore.resetCounts(currentId);
         }
         ChannelStore.setUnreadCounts();
@@ -321,7 +321,7 @@ ChannelStore.dispatchToken = AppDispatcher.register((payload) => {
             ChannelStore.pStoreChannelMember(action.member);
         }
         currentId = ChannelStore.getCurrentId();
-        if (currentId && !document.hidden) {
+        if (currentId && window.isActive) {
             ChannelStore.resetCounts(currentId);
         }
         ChannelStore.setUnreadCount(action.channel.id);

web/react/stores/socket_store.jsx

@@ -202,10 +202,10 @@ function handleNewPostEvent(msg, translations) {
 
     // Update channel state
     if (ChannelStore.getCurrentId() === msg.channel_id) {
-        if (document.hidden) {
-            AsyncClient.getChannel(msg.channel_id);
-        } else {
+        if (window.isActive) {
             AsyncClient.updateLastViewedAt();
+        } else {
+            AsyncClient.getChannel(msg.channel_id);
         }
     } else if (UserStore.getCurrentId() !== msg.user_id || post.type !== Constants.POST_TYPE_JOIN_LEAVE) {
         AsyncClient.getChannel(msg.channel_id);

web/react/utils/async_client.jsx

@@ -549,7 +549,7 @@ export function getPosts(id) {
                 type: ActionTypes.RECEIVED_POSTS,
                 id: channelId,
                 before: true,
-                numRequested: Constants.POST_CHUNK_SIZE,
+                numRequested: 0,
                 post_list: data
             });