BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into chat-old-messages-re-render

Browse Source
This commit is contained in:
João Francisco Siebel 2018-12-19 14:16:24 -02:00
commit 35a02339dc
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bigbluebutton-html5/imports/ui/components/chat/container.jsx
View File

@ -156,7 +156,7 @@ export default injectIntl(withTracker(({ intl }) => {
const lastReadMessageTime = ChatService.lastReadMessageTime(chatID);
return {
chatID: Session.get('idChatOpen'),
chatID,
chatName,
title,
messages,

2
bigbluebutton-html5/imports/ui/components/chat/service.js
View File

@ -145,7 +145,7 @@ const lastReadMessageTime = (receiverID) => {
};
const sendGroupMessage = (message) => {
const chatID = Session.get('idChatOpen');
const chatID = Session.get('idChatOpen') || PUBLIC_CHAT_ID;
const isPublicChat = chatID === PUBLIC_CHAT_ID;
let chatId = PUBLIC_GROUP_CHAT_ID;

6
bigbluebutton-html5/imports/ui/components/tooltip/component.jsx
View File

@ -51,8 +51,10 @@ class Tooltip extends Component {
onHide: this.onHide,
wait: Tooltip.wait,
touchHold: true,
size: 'small',
distance: 1,
size: 'regular',
distance: 10,
arrow: true,
arrowType: 'sharp',
};
this.tooltip = Tippy(`#${this.tippySelectorId}`, options);
}