Merge branch 'origin/develop_apply_design_chat' into 'origin/develop_apply_design'

Origin/develop apply design chat

See merge request !17

public_new/contact.html

@@ -92,7 +92,7 @@
         <div class="chat_list">
         <div class="chat_list">
           <!-- 全グループ -->
           <!-- 全グループ -->
           <ul class="p-0 chat_make_room_list">
           <ul class="p-0 chat_make_room_list">
-            <li class="d-flex align-items-center">
+            <li class="d-flex align-items-center" id="rootGroupArea">
               <a href="#" class="w-100" id="rootGroupBtn">
               <a href="#" class="w-100" id="rootGroupBtn">
                 <div class="chat_item d-flex flex-row align-items-center">
                 <div class="chat_item d-flex flex-row align-items-center">
                   <div class="chat_item_l">
                   <div class="chat_item_l">
@@ -110,7 +110,7 @@
                 </div>
                 </div>
               </a>
               </a>
             </li>
             </li>
-            <li class="d-flex align-items-center">
+            <li class="d-flex align-items-center" id="parentGroupArea">
               <a href="#" class="w-100" id="parentGroupBtn">
               <a href="#" class="w-100" id="parentGroupBtn">
                 <div class="chat_item d-flex flex-row align-items-center">
                 <div class="chat_item d-flex flex-row align-items-center">
                   <div class="chat_item_l">
                   <div class="chat_item_l">

public_new/js/chat-ui.js

@@ -1334,7 +1334,8 @@ CHAT_UI.insertFavoriteGroup = function(groupId) {
 };
 };
 
 
 //全グループ検索画面表示。
 //全グループ検索画面表示。
-CHAT_UI.refreshAllGroupSearch = function(groupId) {
+CHAT_UI.refreshAllGroupSearch = function(paramGroupId) {
+    var groupId = paramGroupId;
     CHAT_UI.showLoadingIndicator();
     CHAT_UI.showLoadingIndicator();
     $('#userNameCard').modal('hide');
     $('#userNameCard').modal('hide');
     $('.cancel').addClass('none');
     $('.cancel').addClass('none');
@@ -1368,11 +1369,18 @@ CHAT_UI.refreshAllGroupSearch = function(groupId) {
         });
         });
     }
     }
     if (typeof result.rootGroupId !== 'undefined') {
     if (typeof result.rootGroupId !== 'undefined') {
+        if (paramGroupId == 0) { groupId = result.rootGroupId }
         $('#rootGroupBtn').on('click', function() {
         $('#rootGroupBtn').on('click', function() {
             CHAT_UI.refreshAllGroupSearch(result.rootGroupId);
             CHAT_UI.refreshAllGroupSearch(result.rootGroupId);
         });
         });
     }
     }
-
+    if (groupId == result.rootGroupId || paramGroupId == '0') {
+        $('#rootGroupArea').addClass('none');
+        $('#parentGroupArea').addClass('none');
+    } else {
+        $('#rootGroupArea').removeClass('none');
+        $('#parentGroupArea').removeClass('none');
+    }
     //該当グループのパースを表示。
     //該当グループのパースを表示。
     var groupPathTemplate;
     var groupPathTemplate;
     $.get({ url: "./template/template_group_path.html", async: false }
     $.get({ url: "./template/template_group_path.html", async: false }