summaryrefslogtreecommitdiffstats
path: root/web/react/utils
diff options
context:
space:
mode:
authorJoram Wilander <jwawilander@gmail.com>2015-07-09 15:26:20 -0400
committerJoram Wilander <jwawilander@gmail.com>2015-07-09 15:26:20 -0400
commit763618ef3613d0af6baea0e1d49abb6641979841 (patch)
treed50327f0fb054224dcc9cc61b9b54df067b6e34e /web/react/utils
parentb6fb6ea3be059d3c54027267760ccca0f95535ee (diff)
parent23c40243a4291bac573ccc05d45ad025b9570f62 (diff)
downloadchat-763618ef3613d0af6baea0e1d49abb6641979841.tar.gz
chat-763618ef3613d0af6baea0e1d49abb6641979841.tar.bz2
chat-763618ef3613d0af6baea0e1d49abb6641979841.zip
Merge pull request #151 from asaadmahmoodspin/master
MM-1469 - Loading message in more channel modal
Diffstat (limited to 'web/react/utils')
-rw-r--r--web/react/utils/async_client.jsx2
1 files changed, 1 insertions, 1 deletions
diff --git a/web/react/utils/async_client.jsx b/web/react/utils/async_client.jsx
index 9383057c3..a2a6f8db7 100644
--- a/web/react/utils/async_client.jsx
+++ b/web/react/utils/async_client.jsx
@@ -104,7 +104,7 @@ module.exports.updateLastViewedAt = function() {
module.exports.getMoreChannels = function(force) {
if (isCallInProgress("getMoreChannels")) return;
- if (ChannelStore.getMoreAll().length == 0 || force) {
+ if (!ChannelStore.getMoreAll() || force) {
callTracker["getMoreChannels"] = utils.getTimestamp();
client.getMoreChannels(