Merge branch 'bugfix/#484-アコーディオンアクション修正' into 'release_sp3'

Bugfix/#484 アコーディオンアクション修正

See merge request !36

public_new/js/chat-ui.js

@@ -1916,15 +1916,13 @@ CHAT_UI.checkForMakeChat = function(checkMemberId) {
         CHAT.globalSelectedUserList = CHAT.globalSelectedUserList.filter(function(shopMemberId) {
             return checkMemberId != shopMemberId;
         });
+        $('.checkbox' + checkMemberId).prop("checked", false).trigger("change");
     } else {
         // add
         CHAT.globalSelectedUserList.push(checkMemberId);
+        $('.checkbox' + checkMemberId).prop("checked", true).trigger("change");
     }
-    if($('.checkbox' + checkMemberId).prop('checked')){
-        $('.checkbox' + checkMemberId).removeAttr('checked');
-    }else{
-      $('.checkbox' + checkMemberId).attr('checked', true);
-    }
+
     let cnt = CHAT.globalSelectedUserList.length;
     if (CHAT.globalSelectedUserList.length > 0) {
         $('.select_member_num').text(cnt);

public_new/js/chat.js

@@ -331,12 +331,12 @@ $(function() {
         $('#chatTitle').text(roomListTitle);
     });
 
-    $('#chat_add_user .search_form .cancel').click(function(){
+    $('#chat_add_user .search_form .cancel').click(function() {
         CHAT.globalSelectedUserList.forEach(function(userId) {
             if ($('.checkbox' + userId).prop('checked')) {
-              $('.checkbox' + checkMemberId).attr('checked', true);
+                $('.checkbox' + userId).prop("checked", false).trigger("change");
             } else {
-              $('.checkbox' + checkMemberId).removeAttr('checked');
+                $('.checkbox' + userId).prop("checked", true).trigger("change");
             }
         });
     });

public_new/template/template_make_room_group_user_list.html

-<div class="category"><div class="category_name"><span>{{groupName}}</span></div></div>
+<div class="category" onclick="CHAT_UI.toggleCategory(this);"><div class="category_name"><span>{{groupName}}</span></div></div>
 <ul class="p-0 chat_make_room_list">
     {{#groupUserList}}
     <li class="d-flex align-items-center">
-        <div class="chat_item d-flex flex-row align-items-center w-100">
+        <div class="chat_item d-flex flex-row align-items-center w-100" onclick="CHAT_UI.checkForMakeChat({{shopMemberId}});" >
             <div class="chat_item_l_chk">
                 <div class="checkbox">
                     <label>
-                        <input type="checkbox" id="checkbox{{shopMemberId}}" name="checkbox[]" class="checkbox-input checkbox{{shopMemberId}}" onchange="CHAT_UI.checkForMakeChat({{shopMemberId}});" {{checked}}>
+                        <input type="checkbox" id="checkbox{{shopMemberId}}" name="checkbox[]" class="checkbox-input checkbox{{shopMemberId}}" onclick="CHAT_UI.checkForMakeChat({{shopMemberId}});" {{checked}}>
                         <span class="checkbox-parts"></span>
                     </label>
                 </div>

public_new/template/template_make_room_user_list.html

 <ul class="p-0 chat_make_room_list">
     {{#userList}}
     <li class="d-flex align-items-center">
-        <div class="chat_item d-flex flex-row align-items-center w-100">
+        <div class="chat_item d-flex flex-row align-items-center w-100" onclick="CHAT_UI.checkForMakeChat({{shopMemberId}});">
             <div class="chat_item_l_chk">
                 <div class="checkbox">
                     <label>
-                        <input type="checkbox" id="checkbox{{shopMemberId}}"  name="checkbox[]" class="checkbox-input checkbox{{shopMemberId}}" onchange="CHAT_UI.checkForMakeChat({{shopMemberId}});" {{checked}}>
+                        <input type="checkbox" id="checkbox{{shopMemberId}}"  name="checkbox[]" class="checkbox-input checkbox{{shopMemberId}}" onclick="CHAT_UI.checkForMakeChat({{shopMemberId}});" {{checked}}>
                         <span class="checkbox-parts"></span>
                     </label>
                 </div>