Commit a2cab780 by onuma

協業に参加できない不具合を修正した。

parent c153ba62
......@@ -75,7 +75,7 @@ ChatRoom.sendMessage = function (e) {
* Load Messages
***********************/
ChatRoom.loadMessages = function (joinRoomID, joinRoomName) {
let roomID = joinRoomID.replace(/['"]+/g, "");
let roomID = joinRoomID.toString().replace(/['"]+/g, "");
roomName = joinRoomName;
// 画面更新
if (serverInfo.isOnline == true) {
......@@ -253,6 +253,8 @@ ChatRoom.renderCollaborationMessage = function (message, isToday, isOtherYear) {
const messageTime = CHAT_UTIL.formatDate(message.insertDate);
const createdAtYear =
message.insertDate.substring(0, 4) + getLocalizedString("year") + " ";
// 協業のタイプを数値から文字列に変換
const strCollaborationType = CHAT_UTIL.getCollaborationType(collaborationInfo.collaborationType);
const html = Mustache.render(collaborationMessageTemplate, {
messageId: message.messageId,
......@@ -261,7 +263,7 @@ ChatRoom.renderCollaborationMessage = function (message, isToday, isOtherYear) {
userList: displayUserList,
insertDate: message.insertDate,
// TODO: peacekim:: should check collaborationInfo.collaborationType is string or number
collaborationType: collaborationInfo.collaborationType,
collaborationType: strCollaborationType,
meetingId: meetingID,
isToday: isToday,
createdAtDay: messageTime.createdAtDay,
......
......@@ -34,7 +34,7 @@
<div class="collabo_btn">
<button class="collaboation_join_button" type="button" name="button"
class="d-flex flex-row justify-content-center align-items-center"
onclick="NativeBridgeDelegate.joinCollaboration({{collaborationType}}, {{meetingId}})" {{#isEnded}} disabled
onclick="NativeBridgeDelegate.joinCollaboration('{{collaborationType}}', {{meetingId}})" {{#isEnded}} disabled
{{/isEnded}}>
<img src="icon/icon_profile_phone_white.svg" alt="通話">
{{#isEnded}}
......
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