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
942249fa
Commit
942249fa
authored
Apr 22, 2021
by
Kim Peace
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'origin/#42573_exist_room' into 'release_sp3'
既存ルームが存在する場合、アラートを表示するように修正 See merge request
!85
parents
42ec00f5
a4829cbb
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
1 deletions
+5
-1
public_new/js/chat-ui.js
+5
-1
No files found.
public_new/js/chat-ui.js
View file @
942249fa
...
...
@@ -2430,7 +2430,11 @@ CHAT_UI.refreshForOffline = function() {
CHAT_UI
.
displayExistRoom
=
function
(
roomId
)
{
if
(
confirm
(
'error_already_exist_same_user'
))
{
android
.
joinRoom
(
roomId
,
''
);
if
(
CHAT_UTIL
.
isIOS
())
{
webkit
.
messageHandlers
.
joinRoom
.
postMessage
({
"roomId"
:
roomId
});
}
else
if
(
CHAT_UTIL
.
isAndroid
())
{
android
.
joinRoom
(
roomId
,
''
);
}
}
return
;
}
...
...
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