Commit b2e55c82 by Lee Daehyun

Merge branch 'release_sp3' into 'bugFix/ネームカード名前ずれ'

# Conflicts:
#   public_new/chat_room.html
parents 35c0cc47 e9bfd760
......@@ -556,6 +556,7 @@ input[name="tab_item"] {
border-radius: 8px;
background-color: #ffffff;
font-size: 18px;
word-break: break-word;
}
.room_left-text.latest .text,
.room_left-text.latest .img_wrap {
......@@ -621,6 +622,7 @@ input[name="tab_item"] {
margin: 0;
margin-left: 80px;
font-size: 18px;
word-break: break-word;
}
/* 吹き出し */
.room_right .text::after {
......
......@@ -1044,7 +1044,7 @@ CHAT_UI.refreshRoomList = function(roomType) {
var displayMsg;
//TODO 協業の場合処理追加必要
if (room.messageType == messageType.TEXT || room.messageType == messageType.TEXT) displayMsg = room.message;
if (room.messageType == messageType.IMAGE || room.messageType == messageType.SYSTEM) displayMsg = getLocalizedString("image");
if (room.messageType == messageType.IMAGE || room.messageType == messageType.VIDEO) displayMsg = getLocalizedString("image");
var attendUserName = [];
room.attendUsers.forEach(function(user) {
user.profileUrl = CHAT.getProfileImgUrl(user.profileUrl);
......
......@@ -135,14 +135,18 @@ CHAT.uploadImage = function(formData) {
}
let downloadPath = CMS_SERVER_URL + '/chatapi/file/download?fileName=' + imageName + '&roomId=' + CHAT.globalLoginParameter.roomId;
const aTag = $('<a/>', {id:"attachedImages"})
const image = $('<img/>',{src:imgPath, width:'auto',style:'max-width:100%'});
var videoSrc = CMS_SERVER_URL + '/chatapi/file/getImage?fileName=' + res.fileName + '&roomId=' + CHAT.globalLoginParameter.roomId;
const totalDiv = $('<div/>', {id:"attachedImages"});
const videoTag = $('<video/>', {controls:"true", width:'auto', style:'max-width:100%'});
const source = $('<source/>', {src:videoSrc});
const downloadIcon = $('<a/>',{href:downloadPath, class:'fa fa-download', download:res.fileName});
aTag.append(image);
aTag.append(downloadIcon);
videoTag.append(source);
totalDiv.append(videoTag);
totalDiv.append(downloadIcon);
let text = aTag.prop('outerHTML');
let text = totalDiv.prop('outerHTML');
let encodedText
try {
encodedText = encodeURIComponent(text)
......
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