Commit f598d8fc by Kim Peace

Merge branch 'bug/start_document_collaboration' into 'develop'

Fixed to use right meeting id

See merge request !224
parents 2917675a 9e738d87
......@@ -284,7 +284,7 @@ ChatRoom.renderCollaborationMessage = function (message, isToday, isOtherYear) {
};
ChatRoom.getMeetingID = function (meetingID) {
return typeof meetingID != "undefined" ? 0 : meetingID;
return typeof meetingID == "undefined" ? 0 : meetingID;
};
ChatRoom.getDisplayUserList = function (userList) {
......
......@@ -45,9 +45,7 @@ FermiWebSocketBridge.hostRequestDone = function (hostID) {
// GET_COLLABORATION_TYPE_RESPONSE
FermiWebSocketBridge.getCollaborationTypeResponse = function (loginID) {
if (typeof meetingID == undefined) {
var meetingID = 0;
}
let meetingID = globalUserInfo.meetingID ?? 0;
fw.sendToMsg("others", "GET_COLLABORATION_TYPE_RESPONSE", {
loginId: loginID,
......
......@@ -105,7 +105,7 @@ CoviewBridge.bindMessageEvent = function () {
}
switch (json.api) {
case "LoginResponse":
CollaborationFeature.didReceiveLoginResponseMessage();
await CollaborationFeature.didReceiveLoginResponseMessage();
break;
case "CreateRoomResponse":
if (json.resultCode == 200) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment