Commit 88efa48f by Kang Donghun

Merge branch 'bugfix/#621_アーカイブ詳細に保存ユーザー名表示' into 'release_sp3'

#42602 アーカイブの保存ユーザに「ユーザ名」が表示されていない #42604 アーカイブの素材がダウンロードできないようにする

See merge request !91
parents d0d8e30f b6327f0e
...@@ -1740,7 +1740,6 @@ CHAT_UI.refreshArchiveDetailScreen = function(archiveId) { ...@@ -1740,7 +1740,6 @@ CHAT_UI.refreshArchiveDetailScreen = function(archiveId) {
//保存ユーザ情報を取得 //保存ユーザ情報を取得
var userInfo = CHAT_DB.getUserInfo(archive.saveUserId); var userInfo = CHAT_DB.getUserInfo(archive.saveUserId);
userInfo.profileUrl = CHAT.getProfileImgUrl(userInfo.profileUrl); userInfo.profileUrl = CHAT.getProfileImgUrl(userInfo.profileUrl);
// アーカイブ情報を表示 // アーカイブ情報を表示
var html = Mustache.render(archiveDetailTemplate, { var html = Mustache.render(archiveDetailTemplate, {
fileName: archive.archiveName, fileName: archive.archiveName,
...@@ -1748,7 +1747,7 @@ CHAT_UI.refreshArchiveDetailScreen = function(archiveId) { ...@@ -1748,7 +1747,7 @@ CHAT_UI.refreshArchiveDetailScreen = function(archiveId) {
chatRoomName: archive.roomName, chatRoomName: archive.roomName,
chatRoomId: archive.roomId, chatRoomId: archive.roomId,
profileImage: userInfo.profileUrl, profileImage: userInfo.profileUrl,
userName: userInfo.shopMembername, userName: userInfo.shopMemberName,
userId: userInfo.shopMemberId userId: userInfo.shopMemberId
}); });
...@@ -1765,11 +1764,11 @@ CHAT_UI.refreshArchiveDetailScreen = function(archiveId) { ...@@ -1765,11 +1764,11 @@ CHAT_UI.refreshArchiveDetailScreen = function(archiveId) {
break; break;
case "1": // 動画 case "1": // 動画
case 1: case 1:
$('#archive_player').prepend('<video class="archive_player" src=' + archiveFilePath + ' controls autoplay muted playsinline></video>'); $('#archive_player').prepend('<video class="archive_player" src=' + archiveFilePath + ' controls autoplay muted playsinline controlsList="nodownload"></video>');
break; break;
case "2": // 音声 case "2": // 音声
case 2: case 2:
$('#archive_player').prepend('<audio class="archive_audio_player" src=' + archiveFilePath + ' controls></audio>'); $('#archive_player').prepend('<audio class="archive_audio_player" src=' + archiveFilePath + ' controls controlsList="nodownload"></audio>');
$('#archive_player').prepend('<img class="archive_player" src=' + "./img/capture.png" + ' />'); $('#archive_player').prepend('<img class="archive_player" src=' + "./img/capture.png" + ' />');
break; break;
case "3": // 文書 case "3": // 文書
......
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