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
9163ccee
Commit
9163ccee
authored
Aug 17, 2021
by
Kim Peace
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed to hide loading indicator when create room already exist and doesnt move to decided
parent
e6f0908c
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
6 deletions
+2
-6
public_new/js/common/native-bridge-delegate.js
+1
-1
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 @
9163ccee
...
@@ -391,10 +391,10 @@ ReverseDelegate.leaveRoom = function () {
...
@@ -391,10 +391,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
;
};
};
public_new/js/views/chats/management/chat-management-common.js
View file @
9163ccee
...
@@ -105,11 +105,7 @@ ChatManagementCommon.showMakeRoomConfirmView = function () {
...
@@ -105,11 +105,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を行う
...
...
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