Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
C
chat_webview
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
abookCommunication
chat_webview
Commits
c0ac2886
Commit
c0ac2886
authored
Aug 18, 2021
by
Kim Peace
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'bug/#43946_room_create_zero_selected' into debug/console_logs
parents
b5dcec54
8202c2de
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
6 deletions
+5
-6
public_new/js/common/native-bridge-delegate.js
+1
-1
public_new/js/views/chats/management/chat-make-room.js
+3
-0
public_new/js/views/chats/management/chat-management-common.js
+1
-5
No files found.
public_new/js/common/native-bridge-delegate.js
View file @
c0ac2886
...
...
@@ -442,10 +442,10 @@ ReverseDelegate.leaveRoom = function () {
CHAT_SOCKET
.
emitLeaveRoom
();
};
// for android call
ReverseDelegate
.
displayExistRoom
=
function
(
roomID
)
{
if
(
confirm
(
"error_already_exist_same_user"
))
{
NativeBridgeDelegate
.
joinRoom
(
roomID
);
}
NativeBridgeDelegate
.
hideLoadingIndicator
();
return
;
};
public_new/js/views/chats/management/chat-make-room.js
View file @
c0ac2886
...
...
@@ -139,6 +139,9 @@ ChatMakeRoom.renderUser = function (url, userList) {
$
(
"#makeRoomConfirmBtn"
).
on
(
"click"
,
function
(
e
)
{
const
selectedUserList
=
ChatManagementCommon
.
selectedUserList
.
join
(
","
);
if
(
selectedUserList
.
length
==
0
)
{
return
;
}
NativeBridgeDelegate
.
saveSelectedUserList
(
selectedUserList
);
$
(
"#makeRoomForm"
).
submit
();
});
...
...
public_new/js/views/chats/management/chat-management-common.js
View file @
c0ac2886
...
...
@@ -107,11 +107,7 @@ ChatManagementCommon.showMakeRoomConfirmView = function () {
} else {
//loadingIndicatorを表示
Common.showLoadingIndicator();
let userIdList = new Array();
selectedUserList.forEach(function (user) {
userIdList.push(user.shopMemberId);
});
let userIdList = selectedUserList.map((user) => user.shopMemberId);
// TODO: check why here using trimmedroomname instead of encodedRoomName
// ルーム名のtrimmingした後、URIencodingを行う
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment