summaryrefslogtreecommitdiffstats
path: root/webapp/stores
diff options
context:
space:
mode:
authorJoram Wilander <jwawilander@gmail.com>2016-10-28 12:41:28 -0400
committerCorey Hulen <corey@hulen.com>2016-10-28 09:41:28 -0700
commitef363fd88ebb731dbb0470ad7cb5f50de0f3845c (patch)
tree08cb5ded05da362e9f2b3ac90d63a7a8e91fd606 /webapp/stores
parentfcf7d185f6ce0ff0a0719779261a487755273147 (diff)
downloadchat-ef363fd88ebb731dbb0470ad7cb5f50de0f3845c.tar.gz
chat-ef363fd88ebb731dbb0470ad7cb5f50de0f3845c.tar.bz2
chat-ef363fd88ebb731dbb0470ad7cb5f50de0f3845c.zip
Fix channel autocomplete and fix channel member query to ignore deleted channels (#4371)
Diffstat (limited to 'webapp/stores')
-rw-r--r--webapp/stores/channel_store.jsx9
1 files changed, 1 insertions, 8 deletions
diff --git a/webapp/stores/channel_store.jsx b/webapp/stores/channel_store.jsx
index 16a094c7b..f0258d02a 100644
--- a/webapp/stores/channel_store.jsx
+++ b/webapp/stores/channel_store.jsx
@@ -26,7 +26,6 @@ class ChannelStoreClass extends EventEmitter {
this.channels = [];
this.myChannelMembers = {};
this.moreChannels = {};
- this.moreChannels.loading = true;
this.stats = {};
this.unreadCounts = {};
}
@@ -300,13 +299,7 @@ class ChannelStoreClass extends EventEmitter {
const ch = this.get(id);
const chMember = this.getMyMember(id);
- if (ch == null) {
- console.log('setUnreadCountByChannel: missing channel id ' + id); //eslint-disable-line no-console
- return;
- }
-
- if (chMember == null) {
- console.log('setUnreadCountByChannel: missing channel member for channel id ' + id); //eslint-disable-line no-console
+ if (ch == null || chMember == null) {
return;
}