Conflict修正。

public_new/js/chat-ui.js

@@ -1617,14 +1617,9 @@ CHAT_UI.refreshArchiveDetailScreen = function(archiveId) {
     var roomId = archive.roomId;
     var roomId = archive.roomId;
     var roomInfo = CHAT_DB.getChatRoomInfo(roomId);
     var roomInfo = CHAT_DB.getChatRoomInfo(roomId);
 
 
-       // アーカイブ情報を表示
-       // let html = Mustache.render(archiveDetailTemplate, {
-    //     fileName: archive.archiveName,
-     //     insertDate: archive.archiveDate,
-       //     chatRoomName: roomInfo.chatRoomName,
-    //     profileImage: "",
-    //     userName: userName
-      // });
+    var userInfo = CHAT_DB.getUserInfo(archive.saveUserId);
+    userInfo.profileUrl = CHAT.getProfileImgUrl(userInfo.profileUrl);
+
 
 
     // アーカイブ情報を表示
     // アーカイブ情報を表示
     var html = Mustache.render(archiveDetailTemplate, {
     var html = Mustache.render(archiveDetailTemplate, {
@@ -1699,13 +1694,7 @@ CHAT_UI.refreshArchiveDetailScreen = function(archiveId) {
 
 
     // チャットルームへのリンク付け
     // チャットルームへのリンク付け
     document.getElementById('joinChatRoom').onclick = function() {
     document.getElementById('joinChatRoom').onclick = function() {
-        //          socket.emit('joinRoom', roomId, roomInfo.chatRoomName, function () {
-        //               $('#archive_detail').html('');
-        //             $('#messages').html('');
-        //             $('.titleRoomName').text(roomInfo.chatRoomName).data('roomName', roomInfo.chatRoomName);
-        //             $('#pills-chat-tab').tab('show');
-        //         });
-        console.log("遷移");
+        CHAT_UI.joinRoom(archive.roomId, archive.roomName);
     }
     }
         
         
     // loadingIndicatorを非表示
     // loadingIndicatorを非表示