From f80d2c4868eef5ef40258be710a0a872c6d5c8af Mon Sep 17 00:00:00 2001 From: Martin Schoeler Date: Thu, 20 Jul 2017 11:49:36 -0300 Subject: [PATCH 1/2] [FIX] Fix error when entering new room when you dont have the preview room permission --- packages/rocketchat-ui/client/lib/RoomHistoryManager.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/packages/rocketchat-ui/client/lib/RoomHistoryManager.js b/packages/rocketchat-ui/client/lib/RoomHistoryManager.js index e6c1eedc009..decfabdb1b1 100644 --- a/packages/rocketchat-ui/client/lib/RoomHistoryManager.js +++ b/packages/rocketchat-ui/client/lib/RoomHistoryManager.js @@ -51,11 +51,12 @@ export const RoomHistoryManager = new class { typeName = (curRoomDoc != null ? curRoomDoc.t : undefined) + (curRoomDoc != null ? curRoomDoc.name : undefined); } - return Meteor.call('loadHistory', rid, ts, limit, ls, function(err, result) { + Meteor.call('loadHistory', rid, ts, limit, ls, function(err, result) { if (err) { return; } let previousHeight; + const messages = result && result.messages || []; room.unreadNotLoaded.set(result.unreadNotLoaded); room.firstUnread.set(result.firstUnread); @@ -64,7 +65,7 @@ export const RoomHistoryManager = new class { previousHeight = wrapper.scrollHeight; } - result.messages.forEach(item => { + messages.forEach(item => { if (item.t !== 'command') { const roles = [ (item.u && item.u._id && UserRoles.findOne(item.u._id, { fields: { roles: 1 }})) || {}, @@ -87,8 +88,8 @@ export const RoomHistoryManager = new class { room.isLoading.set(false); if (room.loaded == null) { room.loaded = 0; } - room.loaded += result.messages.length; - if (result.messages.length < limit) { + room.loaded += messages.length; + if (messages.length < limit) { return room.hasMore.set(false); } }); From 28770fa57cbc339abf314cc071d9f1f7d8941edf Mon Sep 17 00:00:00 2001 From: Martin Schoeler Date: Fri, 21 Jul 2017 16:09:06 -0300 Subject: [PATCH 2/2] use es6 --- packages/rocketchat-ui/client/lib/RoomHistoryManager.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/rocketchat-ui/client/lib/RoomHistoryManager.js b/packages/rocketchat-ui/client/lib/RoomHistoryManager.js index decfabdb1b1..e5aaa2f37e5 100644 --- a/packages/rocketchat-ui/client/lib/RoomHistoryManager.js +++ b/packages/rocketchat-ui/client/lib/RoomHistoryManager.js @@ -56,7 +56,7 @@ export const RoomHistoryManager = new class { return; } let previousHeight; - const messages = result && result.messages || []; + const {messages = []} = result; room.unreadNotLoaded.set(result.unreadNotLoaded); room.firstUnread.set(result.firstUnread);