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
ca6ea671
Commit
ca6ea671
authored
May 11, 2021
by
Kang Donghun
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'release_sp3_host_exit_event' into 'release_sp3'
ホストが協業を終了すると参加ユーザー全員の協業が終了されるように修正 See merge request
!112
parents
cd102226
b7873b7c
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
28 additions
and
5 deletions
+28
-5
public_new/js/collaboration.js
+1
-1
public_new/js/language_en.js
+2
-1
public_new/js/language_ja.js
+2
-1
public_new/js/language_ko.js
+2
-1
public_new/js/share.js
+21
-1
No files found.
public_new/js/collaboration.js
View file @
ca6ea671
...
@@ -25,7 +25,7 @@ $(function () {
...
@@ -25,7 +25,7 @@ $(function () {
$
(
"#collabo_main"
).
toggleClass
(
"noscroll"
);
$
(
"#collabo_main"
).
toggleClass
(
"noscroll"
);
// 他のボタンを非表示
// 他のボタンを非表示
$
(
".add_user_btn"
).
toggleClass
(
"none"
);
//
$(".add_user_btn").toggleClass("none");
$
(
".menu_btn"
).
toggleClass
(
"none"
);
$
(
".menu_btn"
).
toggleClass
(
"none"
);
if
(
$
(
"#overlay_user_list.overlay"
).
hasClass
(
"noscroll"
))
{
if
(
$
(
"#overlay_user_list.overlay"
).
hasClass
(
"noscroll"
))
{
...
...
public_new/js/language_en.js
View file @
ca6ea671
...
@@ -92,5 +92,6 @@ $.lang.en = {
...
@@ -92,5 +92,6 @@ $.lang.en = {
"collaboration_start"
:
"collaboration start"
,
"collaboration_start"
:
"collaboration start"
,
"collaboration_end"
:
"collaboration end"
,
"collaboration_end"
:
"collaboration end"
,
"notify_not_released"
:
"It will be released later."
,
"notify_not_released"
:
"It will be released later."
,
"error_empty_room_name"
:
"Please input room name."
"error_empty_room_name"
:
"Please input room name."
,
"inform_exit_host_collaboration"
:
"The host has terminated the collaboration."
}
}
public_new/js/language_ja.js
View file @
ca6ea671
...
@@ -92,5 +92,6 @@ $.lang.ja = {
...
@@ -92,5 +92,6 @@ $.lang.ja = {
"collaboration_start"
:
"協業中"
,
"collaboration_start"
:
"協業中"
,
"collaboration_end"
:
"協業終了"
,
"collaboration_end"
:
"協業終了"
,
"notify_not_released"
:
"今後リリース予定です。"
,
"notify_not_released"
:
"今後リリース予定です。"
,
"error_empty_room_name"
:
"ルーム名を入力してください。"
"error_empty_room_name"
:
"ルーム名を入力してください。"
,
"inform_exit_host_collaboration"
:
"ホストが協業を終了しました。"
}
}
public_new/js/language_ko.js
View file @
ca6ea671
...
@@ -92,5 +92,6 @@ $.lang.ko = {
...
@@ -92,5 +92,6 @@ $.lang.ko = {
"collaboration_start"
:
"협업중"
,
"collaboration_start"
:
"협업중"
,
"collaboration_end"
:
"협업종료"
,
"collaboration_end"
:
"협업종료"
,
"notify_not_released"
:
"추후 공개예정입니다."
,
"notify_not_released"
:
"추후 공개예정입니다."
,
"error_empty_room_name"
:
"룸명을 입력해주세요."
"error_empty_room_name"
:
"룸명을 입력해주세요."
,
"inform_exit_host_collaboration"
:
"호스트가 협업을 종료하였습니다."
}
}
public_new/js/share.js
View file @
ca6ea671
...
@@ -2,6 +2,7 @@
...
@@ -2,6 +2,7 @@
/* Functions */
/* Functions */
/* --------------------------------------------------- */
/* --------------------------------------------------- */
let
coview_api
=
new
CoviewApi
();
let
coview_api
=
new
CoviewApi
();
let
isLeaved
=
false
;
$
(
function
()
{
$
(
function
()
{
var
coviewApiActive
=
coview_api
.
Init
(
var
coviewApiActive
=
coview_api
.
Init
(
{
{
...
@@ -134,8 +135,25 @@ $(function() {
...
@@ -134,8 +135,25 @@ $(function() {
$
(
"#loadingIndicator"
).
removeClass
(
"full_active"
);
$
(
"#loadingIndicator"
).
removeClass
(
"full_active"
);
});
});
coview_api
.
addEventListener
(
"allbye"
,
function
()
{
console
.
log
(
"=============> ALL BYE : share allbye"
);
$
(
"#loadingIndicator"
).
removeClass
(
"full_active"
);
});
coview_api
.
addEventListener
(
"guestbye"
,
function
()
{
console
.
log
(
"=============> GUEST BYE : share guestbye"
);
$
(
"#loadingIndicator"
).
removeClass
(
"full_active"
);
});
coview_api
.
addEventListener
(
"hostbye"
,
function
()
{
console
.
log
(
"=============> HOST BYE : share hostbye"
);
alert
(
getLocalizedString
(
"inform_exit_host_collaboration"
));
Coview_exitCollaboration
();
$
(
"#loadingIndicator"
).
removeClass
(
"full_active"
);
});
coview_api
.
addEventListener
(
"destroy"
,
function
()
{
coview_api
.
addEventListener
(
"destroy"
,
function
()
{
console
.
log
(
"=============>
START : share start
"
);
console
.
log
(
"=============>
DESTROY : share destroy
"
);
coview_api
.
LeaveRoom
();
coview_api
.
LeaveRoom
();
$
(
".coview_share_area"
).
hide
();
$
(
".coview_share_area"
).
hide
();
$
(
"#loadingIndicator"
).
removeClass
(
"full_active"
);
$
(
"#loadingIndicator"
).
removeClass
(
"full_active"
);
...
@@ -144,6 +162,7 @@ $(function() {
...
@@ -144,6 +162,7 @@ $(function() {
coview_api
.
addEventListener
(
"message"
,
async
function
(
event
,
json
)
{
coview_api
.
addEventListener
(
"message"
,
async
function
(
event
,
json
)
{
console
.
log
(
"+++ addEventListener"
,
json
);
console
.
log
(
"+++ addEventListener"
,
json
);
console
.
log
(
"processMessage api = "
,
json
.
api
);
console
.
log
(
"processMessage api = "
,
json
.
api
);
if
(
isLeaved
)
return
;
let
loginIdList
=
new
Array
();
let
loginIdList
=
new
Array
();
switch
(
json
.
api
){
switch
(
json
.
api
){
case
"LoginResponse"
:
case
"LoginResponse"
:
...
@@ -218,6 +237,7 @@ function Coview_moveToVideoShareArea() {
...
@@ -218,6 +237,7 @@ function Coview_moveToVideoShareArea() {
function
Coview_exitCollaboration
()
{
function
Coview_exitCollaboration
()
{
coview_api
.
LeaveRoom
();
coview_api
.
LeaveRoom
();
isLeaved
=
true
;
if
(
collaborationJoinFlg
!=
'2'
)
{
if
(
collaborationJoinFlg
!=
'2'
)
{
CHAT_UI
.
joinRoom
(
CHAT
.
globalLoginParameter
.
roomId
,
CHAT
.
globalLoginParameter
.
name
);
CHAT_UI
.
joinRoom
(
CHAT
.
globalLoginParameter
.
roomId
,
CHAT
.
globalLoginParameter
.
name
);
}
else
{
}
else
{
...
...
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