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
5b59f0d6
Commit
5b59f0d6
authored
Apr 17, 2021
by
Takatoshi Miura
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'origin/bugfix_chatroom' into 'release_sp3'
Origin/bugfix chatroom See merge request
!66
parents
4970ca85
67366ff4
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
3 deletions
+6
-3
public_new/js/chat-error.js
+1
-1
public_new/js/chat-room.js
+1
-1
public_new/js/chat-ui.js
+4
-1
No files found.
public_new/js/chat-error.js
View file @
5b59f0d6
jQuery
(
'#homeButton'
).
on
(
'click'
,
function
()
{
if
(
CHAT_UTIL
.
isIOS
())
{
//TODO IOS処理追加必要。
webkit
.
messageHandlers
.
goHome
.
postMessage
({});
}
else
if
(
CHAT_UTIL
.
isAndroid
())
{
android
.
goHome
();
}
...
...
public_new/js/chat-room.js
View file @
5b59f0d6
...
...
@@ -15,7 +15,7 @@ $('#roomNameChangeBtn').click(function() {
//TODO validation
var
changeRoomName
=
$
(
'#roomNameInput'
).
val
();
if
(
CHAT_UTIL
.
isIOS
())
{
//TODO
webkit
.
messageHandlers
.
changeRoomName
.
postMessage
(
changeRoomName
);
}
else
if
(
CHAT_UTIL
.
isAndroid
())
{
android
.
changeRoomName
(
changeRoomName
);
}
...
...
public_new/js/chat-ui.js
View file @
5b59f0d6
...
...
@@ -1730,7 +1730,10 @@ CHAT_UI.refreshArchiveDetailScreen = function(archiveId) {
// 参加ユーザ情報を表示
let
attendUserList
=
archive
.
attendUserIds
;
attendUserList
=
JSON
.
parse
(
archive
.
attendUserIds
);
if
(
typeof
(
android
)
!=
"undefined"
)
{
// ios実装不要
attendUserList
=
JSON
.
parse
(
archive
.
attendUserIds
);
}
attendUserList
.
forEach
(
function
(
user
)
{
...
...
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