Merge branch 'release_sp3' into features/release_sp3_collaboration_audio

public_new/archive_detail.html

@@ -39,7 +39,7 @@
       <div class="col-4 pr-0">
       <div class="col-4 pr-0">
         <div class="nav-item">
         <div class="nav-item">
           <div class="nav_prev">
           <div class="nav_prev">
-            <a href="archive.html"><span class="ttl_archive">アーカイブ</span></a>
+            <a href="archive.html"><span style="font-size: 15px;">アーカイブ</span></a>
           </div>
           </div>
         </div>
         </div>
       </div>
       </div>
@@ -107,7 +107,7 @@
         <div class="d-flex flex-row">
         <div class="d-flex flex-row">
           <div class="d-flex flex-column">
           <div class="d-flex flex-column">
             <img src="{{profileImage}}" alt="プロフィール画像"   onclick="CHAT_UI.makeNameCard({{userId}})" >
             <img src="{{profileImage}}" alt="プロフィール画像"   onclick="CHAT_UI.makeNameCard({{userId}})" >
-            <span>{{userName}}</span>
+            <p>{{userName}}</p>
           </div>
           </div>
         </div>
         </div>
       </div>
       </div>

public_new/js/chat-ui.js

@@ -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) {
         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) {
             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": // 文書
@@ -2423,7 +2422,7 @@ CHAT_UI.refreshForOffline = function() {
     $('#imageInputButton').addClass('ui-state-disabled');
     $('#imageInputButton').addClass('ui-state-disabled');
     $('#messageSend').prop('disabled', true);
     $('#messageSend').prop('disabled', true);
     $('#messageInput').prop('disabled', true);
     $('#messageInput').prop('disabled', true);
-    $('#messageInput').prop('placeholder', 'ネットワークに接続できません');
+    $('#messageInput').prop('placeholder', '');
     $('#favoriteButton').prop('disabled', true);
     $('#favoriteButton').prop('disabled', true);
     $('#roomMenu').hide();
     $('#roomMenu').hide();
     $('.fa-download').hide();
     $('.fa-download').hide();

public_new/js/chat.js

@@ -279,6 +279,7 @@ $(function() {
     // 検索アイコン押下イベント
     // 検索アイコン押下イベント
     $('.nav_item_wrap .search_menu').click(function(){
     $('.nav_item_wrap .search_menu').click(function(){
         $('.nav_item_wrap').addClass('none');
         $('.nav_item_wrap').addClass('none');
+        $('.footer-wrap').addClass('none');
         $('.chat_room_src_form').removeClass('none');
         $('.chat_room_src_form').removeClass('none');
         $('.room_container').addClass('none');
         $('.room_container').addClass('none');
         $('.overlay_src_msg').removeClass('none');
         $('.overlay_src_msg').removeClass('none');
@@ -292,6 +293,7 @@ $(function() {
     });
     });
     $('.chat_room_src_form .cancel').click(function(){
     $('.chat_room_src_form .cancel').click(function(){
         $('.nav_item_wrap').removeClass('none');
         $('.nav_item_wrap').removeClass('none');
+        $('.footer-wrap').removeClass('none');
         $('.chat_room_src_form').addClass('none');
         $('.chat_room_src_form').addClass('none');
         $('.chat_room_src_form input').val('');
         $('.chat_room_src_form input').val('');
         $('.room_container').removeClass('none');
         $('.room_container').removeClass('none');
@@ -303,6 +305,7 @@ $(function() {
         $('.chat_room_src_form input[type="search"]').blur();
         $('.chat_room_src_form input[type="search"]').blur();
         $('#searchMessage').removeClass('onfocus');
         $('#searchMessage').removeClass('onfocus');
         $('.chat_list').addClass('none');
         $('.chat_list').addClass('none');
+        CHAT_UI.scrollToBottom();
     });
     });
 
 
     $('.chat_room_src_form input[type="search"]').click(function() {
     $('.chat_room_src_form input[type="search"]').click(function() {
@@ -417,6 +420,7 @@ $(function() {
 
 
     var beforeHeight;
     var beforeHeight;
     var beforeScroll;
     var beforeScroll;
+    var footerHeight = $('.footer-wrap').height();
     window.addEventListener("resize", function() {
     window.addEventListener("resize", function() {
         console.log('aaaa');
         console.log('aaaa');
         var afterHeight = window.innerHeight;
         var afterHeight = window.innerHeight;
@@ -428,7 +432,7 @@ $(function() {
 
 
         } else {
         } else {
             //キーボード非表示
             //キーボード非表示
-            $('.room_container').css('margin-bottom', $('.footer-wrap').height());
+            $('.room_container').css('margin-bottom', footerHeight);
             window.scrollTo(0, beforeScroll);
             window.scrollTo(0, beforeScroll);
         }
         }
     });
     });