4 files changed, 11 insertions, 20 deletions

diff --git a/web/react/stores/channel_store.jsx b/web/react/stores/channel_store.jsx
index 0bfde77b4..afc960fcf 100644
--- a/web/react/stores/channel_store.jsx
+++ b/web/react/stores/channel_store.jsx
@@ -317,7 +317,9 @@ ChannelStore.dispatchToken = AppDispatcher.register((payload) => {
 
     case ActionTypes.RECIEVED_CHANNEL:
         ChannelStore.pStoreChannel(action.channel);
-        ChannelStore.pStoreChannelMember(action.member);
+        if (action.member) {
+            ChannelStore.pStoreChannelMember(action.member);
+        }
         currentId = ChannelStore.getCurrentId();
         if (currentId) {
             ChannelStore.resetCounts(currentId);
diff --git a/web/react/stores/preference_store.jsx b/web/react/stores/preference_store.jsx
index e6a1d8a2b..543129aca 100644
--- a/web/react/stores/preference_store.jsx
+++ b/web/react/stores/preference_store.jsx
@@ -1,4 +1,4 @@
-// Copyright (c) 2015 Spinpunch, Inc. All Rights Reserved.
+// Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
 import Constants from '../utils/constants.jsx';
diff --git a/web/react/stores/socket_store.jsx b/web/react/stores/socket_store.jsx
index ee501c149..24fa79ca6 100644
--- a/web/react/stores/socket_store.jsx
+++ b/web/react/stores/socket_store.jsx
@@ -59,13 +59,14 @@ class SocketStoreClass extends EventEmitter {
             conn.onopen = () => {
                 if (this.failCount > 0) {
                     console.log('websocket re-established connection'); //eslint-disable-line no-console
+
+                    if (ErrorStore.getLastError()) {
+                        ErrorStore.storeLastError(null);
+                        ErrorStore.emitChange();
+                    }
                 }
 
                 this.failCount = 0;
-                if (ErrorStore.getLastError()) {
-                    ErrorStore.storeLastError(null);
-                    ErrorStore.emitChange();
-                }
             };
 
             conn.onclose = () => {
@@ -228,6 +229,7 @@ function handlePostEditEvent(msg) {
     // Store post
     const post = JSON.parse(msg.props.post);
     PostStore.storePost(post);
+    PostStore.emitChange();
 
     // Update channel state
     if (ChannelStore.getCurrentId() === msg.channel_id) {
diff --git a/web/react/stores/suggestion_store.jsx b/web/react/stores/suggestion_store.jsx
index 2250ec234..9cd566c22 100644
--- a/web/react/stores/suggestion_store.jsx
+++ b/web/react/stores/suggestion_store.jsx
@@ -38,7 +38,6 @@ class SuggestionStore extends EventEmitter {
         // items: a list of objects backing the terms which may be used in rendering
         // components: a list of react components that can be used to render their corresponding item
         // selection: the term currently selected by the keyboard
-        // completeOnSpace: whether or not space will trigger the term to be autocompleted
         this.suggestions = new Map();
     }
 
@@ -79,8 +78,7 @@ class SuggestionStore extends EventEmitter {
             terms: [],
             items: [],
             components: [],
-            selection: '',
-            completeOnSpace: true
+            selection: ''
         });
     }
 
@@ -95,7 +93,6 @@ class SuggestionStore extends EventEmitter {
         suggestion.terms = [];
         suggestion.items = [];
         suggestion.components = [];
-        suggestion.completeOnSpace = true;
     }
 
     clearSelection(id) {
@@ -120,12 +117,6 @@ class SuggestionStore extends EventEmitter {
         suggestion.matchedPretext = matchedPretext;
     }
 
-    setCompleteOnSpace(id, completeOnSpace) {
-        const suggestion = this.suggestions.get(id);
-
-        suggestion.completeOnSpace = completeOnSpace;
-    }
-
     addSuggestion(id, term, item, component) {
         const suggestion = this.suggestions.get(id);
 
@@ -189,10 +180,6 @@ class SuggestionStore extends EventEmitter {
         return this.suggestions.get(id).selection;
     }
 
-    shouldCompleteOnSpace(id) {
-        return this.suggestions.get(id).completeOnSpace;
-    }
-
     selectNext(id) {
         this.setSelectionByDelta(id, 1);
     }