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
8e887da3
Commit
8e887da3
authored
Apr 19, 2021
by
Takatoshi Miura
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'origin/bugfix_create_room' into 'release_sp3'
ルーム開設できないバグの修正 See merge request
!67
parents
5b59f0d6
aaac2c3f
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
13 deletions
+4
-13
public_new/chat.html
+1
-0
public_new/js/chat-ui.js
+3
-5
public_new/js/chat.js
+0
-8
No files found.
public_new/chat.html
View file @
8e887da3
...
...
@@ -133,6 +133,7 @@
}
else
{
webkit
.
messageHandlers
.
loginInfoRequestMessageHandlerId
.
postMessage
({});
webkit
.
messageHandlers
.
getGlobalParameter
.
postMessage
({});
webkit
.
messageHandlers
.
saveSelectedUserList
.
postMessage
(
""
);
}
function
getGlobalParam
(
chatServerUrl
,
cmsServerUrl
,
platform
,
isMobile
,
isOnline
)
{
CHAT_SERVER_URL
=
chatServerUrl
;
...
...
public_new/js/chat-ui.js
View file @
8e887da3
...
...
@@ -1334,8 +1334,7 @@ $('#makeRoomConfirmBtn').on('click', function(e) {
if
(
typeof
(
android
)
!=
"undefined"
)
{
android
.
saveSelectedUserList
(
CHAT
.
globalSelectedUserList
.
join
(
","
));
}
else
{
var
userList
=
CHAT
.
globalSelectedUserList
.
join
(
","
);
webkit
.
messageHandlers
.
saveSelectedUserList
.
postMessage
(
userList
);
webkit
.
messageHandlers
.
saveSelectedUserList
.
postMessage
(
CHAT
.
globalSelectedUserList
.
join
(
","
));
}
$
(
'#makeRoomForm'
).
submit
();
});
...
...
@@ -1344,8 +1343,7 @@ $('#addUserConfirmBtn').on('click', function(e) {
if
(
typeof
(
android
)
!=
"undefined"
)
{
android
.
saveSelectedUserList
(
CHAT
.
globalSelectedUserList
.
join
(
","
));
}
else
{
var
userList
=
CHAT
.
globalSelectedUserList
.
join
(
","
);
webkit
.
messageHandlers
.
saveSelectedUserList
.
postMessage
(
userList
);
webkit
.
messageHandlers
.
saveSelectedUserList
.
postMessage
(
CHAT
.
globalSelectedUserList
.
join
(
","
));
}
$
(
'#addUserForm'
).
submit
();
});
...
...
@@ -2095,7 +2093,7 @@ CHAT_UI.showMakeRoomConfirmView = function() {
if
(
typeof
(
android
)
!=
"undefined"
)
{
android
.
createChatRoom
(
"1"
,
userIdList
.
join
(
','
),
trimmedRoomName
,
makeRoomFlg
.
MAKE_ROOM
);
}
else
{
webkit
.
messageHandlers
.
createChatRoom
.
postMessage
({
"roomType"
:
"1"
,
"userIdList"
:
userIdList
.
join
(
','
),
"roomName"
:
new
RoomName
,
"screenFlg"
:
makeRoomFlg
.
MAKE_ROOM
});
webkit
.
messageHandlers
.
createChatRoom
.
postMessage
({
"roomType"
:
"1"
,
"userIdList"
:
userIdList
.
join
(
','
),
"roomName"
:
trimmed
RoomName
,
"screenFlg"
:
makeRoomFlg
.
MAKE_ROOM
});
}
}
});
...
...
public_new/js/chat.js
View file @
8e887da3
...
...
@@ -251,14 +251,6 @@ CHAT.leaveRoom = function() {
}
$
(
function
()
{
// ルーム人数選択確認イベント
$
(
'.make_room_btn button'
).
click
(
function
(){
$
(
'form'
).
submit
();
});
// ルーム人数選択イベント
$
(
'.make_room_confirm_btn button'
).
click
(
function
(){
$
(
'form'
).
submit
();
});
// ユーザー追加確認イベント
$
(
'.add_user_confirm_btn button'
).
click
(
function
(){
$
(
'form'
).
submit
();
...
...
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