summaryrefslogtreecommitdiffstats
path: root/web/react/utils/async_client.jsx
diff options
context:
space:
mode:
Diffstat (limited to 'web/react/utils/async_client.jsx')
-rw-r--r--web/react/utils/async_client.jsx29
1 files changed, 19 insertions, 10 deletions
diff --git a/web/react/utils/async_client.jsx b/web/react/utils/async_client.jsx
index 0b87bbd7b..349fe9021 100644
--- a/web/react/utils/async_client.jsx
+++ b/web/react/utils/async_client.jsx
@@ -346,24 +346,33 @@ module.exports.search = function(terms) {
module.exports.getPosts = function(force, id, maxPosts) {
if (PostStore.getCurrentPosts() == null || force) {
- var channelId = id ? id : ChannelStore.getCurrentId();
+ var channelId = id;
+ if (channelId == null) {
+ channelId = ChannelStore.getCurrentId();
+ }
- if (isCallInProgress('getPosts_'+channelId)) return;
+ if (isCallInProgress('getPosts_' + channelId)) {
+ return;
+ }
- var post_list = PostStore.getCurrentPosts();
+ var postList = PostStore.getCurrentPosts();
- if (!maxPosts) { maxPosts = Constants.POST_CHUNK_SIZE * Constants.MAX_POST_CHUNKS };
+ var max = maxPosts;
+ if (max == null) {
+ max = Constants.POST_CHUNK_SIZE * Constants.MAX_POST_CHUNKS;
+ }
// if we already have more than POST_CHUNK_SIZE posts,
// let's get the amount we have but rounded up to next multiple of POST_CHUNK_SIZE,
// with a max at maxPosts
- var numPosts = Math.min(maxPosts, Constants.POST_CHUNK_SIZE);
- if (post_list && post_list.order.length > 0) {
- numPosts = Math.min(maxPosts, Constants.POST_CHUNK_SIZE * Math.ceil(post_list.order.length / Constants.POST_CHUNK_SIZE));
+ var numPosts = Math.min(max, Constants.POST_CHUNK_SIZE);
+ if (postList && postList.order.length > 0) {
+ numPosts = Math.min(max, Constants.POST_CHUNK_SIZE * Math.ceil(postList.order.length / Constants.POST_CHUNK_SIZE));
}
if (channelId != null) {
- callTracker['getPosts_'+channelId] = utils.getTimestamp();
+ callTracker['getPosts_' + channelId] = utils.getTimestamp();
+
client.getPosts(
channelId,
0,
@@ -383,7 +392,7 @@ module.exports.getPosts = function(force, id, maxPosts) {
dispatchError(err, 'getPosts');
},
function() {
- callTracker['getPosts_'+channelId] = 0;
+ callTracker['getPosts_' + channelId] = 0;
}
);
}
@@ -396,7 +405,7 @@ function getMe() {
}
callTracker.getMe = utils.getTimestamp();
- client.getMe(
+ client.getMeSynchronous(
function(data, textStatus, xhr) {
callTracker.getMe = 0;