Skip to content

C
chat_webview
Commit aeed436b by Kang Donghun
Options

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

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

See merge request !36
parents 51e575fb 75d072a0
Showing with 11 additions and 13 deletions
public_new/js/chat-ui.js
...@@ -1916,15 +1916,13 @@ CHAT_UI.checkForMakeChat = function(checkMemberId) { ...@@ -1916,15 +1916,13 @@ CHAT_UI.checkForMakeChat = function(checkMemberId) {
CHAT.globalSelectedUserList = CHAT.globalSelectedUserList.filter(function(shopMemberId) { CHAT.globalSelectedUserList = CHAT.globalSelectedUserList.filter(function(shopMemberId) {
return checkMemberId != shopMemberId; return checkMemberId != shopMemberId;
}); });
$('.checkbox' + checkMemberId).prop("checked", false).trigger("change");
} else { } else {
// add // add
CHAT.globalSelectedUserList.push(checkMemberId); 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; let cnt = CHAT.globalSelectedUserList.length;
if (CHAT.globalSelectedUserList.length > 0) { if (CHAT.globalSelectedUserList.length > 0) {
$('.select_member_num').text(cnt); $('.select_member_num').text(cnt);
......
public_new/js/chat.js
...@@ -331,12 +331,12 @@ $(function() { ...@@ -331,12 +331,12 @@ $(function() {
$('#chatTitle').text(roomListTitle); $('#chatTitle').text(roomListTitle);
}); });
$('#chat_add_user .search_form .cancel').click(function(){ $('#chat_add_user .search_form .cancel').click(function() {
CHAT.globalSelectedUserList.forEach(function(userId) { CHAT.globalSelectedUserList.forEach(function(userId) {
if ($('.checkbox' + userId).prop('checked')) { if ($('.checkbox' + userId).prop('checked')) {
$('.checkbox' + checkMemberId).attr('checked', true); $('.checkbox' + userId).prop("checked", false).trigger("change");
} else { } 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"> <ul class="p-0 chat_make_room_list">
{{#groupUserList}} {{#groupUserList}}
<li class="d-flex align-items-center"> <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="chat_item_l_chk">
<div class="checkbox"> <div class="checkbox">
<label> <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> <span class="checkbox-parts"></span>
</label> </label>
</div> </div>
......
public_new/template/template_make_room_user_list.html
<ul class="p-0 chat_make_room_list"> <ul class="p-0 chat_make_room_list">
{{#userList}} {{#userList}}
<li class="d-flex align-items-center"> <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="chat_item_l_chk">
<div class="checkbox"> <div class="checkbox">
<label> <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> <span class="checkbox-parts"></span>
</label> </label>
</div> </div>
......
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