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

# Conflicts:
#   public_new/chat_room.html

public_new/css/chat.css

@@ -556,6 +556,7 @@ input[name="tab_item"] {
   border-radius: 8px;
   border-radius: 8px;
   background-color: #ffffff;
   background-color: #ffffff;
   font-size: 18px;
   font-size: 18px;
+  word-break: break-word;
 }
 }
 .room_left-text.latest .text,
 .room_left-text.latest .text,
 .room_left-text.latest .img_wrap {
 .room_left-text.latest .img_wrap {
@@ -621,6 +622,7 @@ input[name="tab_item"] {
   margin: 0;
   margin: 0;
   margin-left: 80px;
   margin-left: 80px;
   font-size: 18px;
   font-size: 18px;
+  word-break: break-word;
 }
 }
 /* 吹き出し */
 /* 吹き出し */
 .room_right .text::after {
 .room_right .text::after {

public_new/js/chat-ui.js

@@ -1044,7 +1044,7 @@ CHAT_UI.refreshRoomList = function(roomType) {
         var displayMsg;
         var displayMsg;
         //TODO 協業の場合処理追加必要
         //TODO 協業の場合処理追加必要
         if (room.messageType == messageType.TEXT || room.messageType == messageType.TEXT) displayMsg = room.message;
         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 = [];
         var attendUserName = [];
         room.attendUsers.forEach(function(user) {
         room.attendUsers.forEach(function(user) {
             user.profileUrl = CHAT.getProfileImgUrl(user.profileUrl);
             user.profileUrl = CHAT.getProfileImgUrl(user.profileUrl);

public_new/js/chat.js

@@ -135,14 +135,18 @@ CHAT.uploadImage = function(formData) {
             }
             }
 
 
             let downloadPath = CMS_SERVER_URL + '/chatapi/file/download?fileName=' + imageName + '&roomId=' + CHAT.globalLoginParameter.roomId;
             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});
             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
             let encodedText
             try {
             try {
                 encodedText = encodeURIComponent(text)
                 encodedText = encodeURIComponent(text)