Commit c0ac2886 by Kim Peace

Merge branch 'bug/#43946_room_create_zero_selected' into debug/console_logs

parents b5dcec54 8202c2de
...@@ -442,10 +442,10 @@ ReverseDelegate.leaveRoom = function () { ...@@ -442,10 +442,10 @@ ReverseDelegate.leaveRoom = function () {
CHAT_SOCKET.emitLeaveRoom(); CHAT_SOCKET.emitLeaveRoom();
}; };
// for android call
ReverseDelegate.displayExistRoom = function (roomID) { ReverseDelegate.displayExistRoom = function (roomID) {
if (confirm("error_already_exist_same_user")) { if (confirm("error_already_exist_same_user")) {
NativeBridgeDelegate.joinRoom(roomID); NativeBridgeDelegate.joinRoom(roomID);
} }
NativeBridgeDelegate.hideLoadingIndicator();
return; return;
}; };
...@@ -139,6 +139,9 @@ ChatMakeRoom.renderUser = function (url, userList) { ...@@ -139,6 +139,9 @@ ChatMakeRoom.renderUser = function (url, userList) {
$("#makeRoomConfirmBtn").on("click", function (e) { $("#makeRoomConfirmBtn").on("click", function (e) {
const selectedUserList = ChatManagementCommon.selectedUserList.join(","); const selectedUserList = ChatManagementCommon.selectedUserList.join(",");
if (selectedUserList.length == 0) {
return;
}
NativeBridgeDelegate.saveSelectedUserList(selectedUserList); NativeBridgeDelegate.saveSelectedUserList(selectedUserList);
$("#makeRoomForm").submit(); $("#makeRoomForm").submit();
}); });
......
...@@ -107,11 +107,7 @@ ChatManagementCommon.showMakeRoomConfirmView = function () { ...@@ -107,11 +107,7 @@ ChatManagementCommon.showMakeRoomConfirmView = function () {
} else { } else {
//loadingIndicatorを表示 //loadingIndicatorを表示
Common.showLoadingIndicator(); Common.showLoadingIndicator();
let userIdList = new Array(); let userIdList = selectedUserList.map((user) => user.shopMemberId);
selectedUserList.forEach(function (user) {
userIdList.push(user.shopMemberId);
});
// TODO: check why here using trimmedroomname instead of encodedRoomName // TODO: check why here using trimmedroomname instead of encodedRoomName
// ルーム名のtrimmingした後、URIencodingを行う // ルーム名のtrimmingした後、URIencodingを行う
......
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