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
850dcd11
Commit
850dcd11
authored
Aug 02, 2021
by
Kim Peace
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed host change logics
parent
ac05490a
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
22 additions
and
6 deletions
+22
-6
public_new/js/views/collaboration/fermi-web-socket-message-handler.js
+5
-0
public_new/js/views/collaboration/share-event-listener.js
+8
-1
public_new/modal_collabo_change_host.html
+2
-1
public_new/modal_collabo_profile.html
+7
-4
No files found.
public_new/js/views/collaboration/fermi-web-socket-message-handler.js
View file @
850dcd11
...
...
@@ -71,6 +71,7 @@ FermiWebSocketMessageHandler.handleMessagesToAll = function (data) {
case
"API_SEND_OWNER_CHANGE_COMPLETE"
:
FermiWebSocketMessageHandler
.
apiSendOwnerChangeComplete
(
data
);
CollaborationFeature
.
updateHost
();
break
;
case
"API_SEND_OWNER_CHANGE_CONFIRM"
:
if
(
globalUserInfo
.
collaborationType
==
COLLABORATION_TYPE
.
CAMERA
)
{
...
...
@@ -93,6 +94,10 @@ FermiWebSocketMessageHandler.handleMessagesToAll = function (data) {
}
CollaborationFeature
.
updateHost
();
break
;
case
"SWITCH_VIDEO"
:
CollaborationFeature
.
updateHost
();
CollaborationUI
.
userListSlideOut
();
$
(
".profile_favorite_btn"
).
click
();
default
:
break
;
}
...
...
public_new/js/views/collaboration/share-event-listener.js
View file @
850dcd11
...
...
@@ -234,6 +234,12 @@ CollaborationFeature.didReceivedJoinRoomInfoResponseMessage = function () {
NativeBridgeDelegate
.
joinRoom
(
roomInfo
.
roomID
,
roomInfo
.
roomName
);
};
CoviewBridge
.
changeHostFromModal
=
function
()
{
const
userID
=
$
(
"#changeHostModal"
).
data
(
"bs.modal"
).
_config
.
collaborationid
// call in agent_app.js
coview_api
.
HostChange
(
userID
);
};
CoviewBridge
.
changeHost
=
function
(
userID
)
{
// call in agent_app.js
coview_api
.
HostChange
(
userID
);
...
...
@@ -488,4 +494,4 @@ CollaborationUI.moveToVideoShareArea = function () {
CollaborationUI
.
showLoadingIndicator
();
$
(
".coview_share_area"
).
show
();
$
(
"#collabo_main"
).
removeClass
(
"none"
);
};
};
\ No newline at end of file
public_new/modal_collabo_change_host.html
View file @
850dcd11
...
...
@@ -15,7 +15,8 @@
<span>
キャンセル
</span>
</div>
</button>
<button
type=
"button"
onclick=
"CoviewBridge.changeHost({{shopMemberId}});"
class=
"profile_chat_btn border-0 bg_blue text_white"
>
<button
type=
"button"
onclick=
"CoviewBridge.changeHostFromModal();"
class=
"profile_chat_btn border-0 bg_blue text_white"
>
<div
class=
"d-flex flex-column"
>
<span>
引き渡し
</span>
</div>
...
...
public_new/modal_collabo_profile.html
View file @
850dcd11
...
...
@@ -22,7 +22,8 @@
<button
type=
"button"
class=
"border-0 bg_navy"
onclick=
"CollaborationUI.removeFavoriteUserInCollaboration({{shopMemberId}})"
id=
"favoriteButton"
>
<div
class=
"d-flex flex-column"
>
<span
class=
"star active shopmember_{{shopMemberId}}"
onclick=
"CHAT_UI.favoriteUserChange('{{shopMemberId}}',this)"
></span>
<span
class=
"star active shopmember_{{shopMemberId}}"
onclick=
"CHAT_UI.favoriteUserChange('{{shopMemberId}}',this)"
></span>
<span>
お気に入り解除
</span>
</div>
</button>
...
...
@@ -31,14 +32,16 @@
<button
type=
"button"
class=
"border-0 bg_navy"
onclick=
"CollaborationUI.insertFavoriteUserInCollaboration({{shopMemberId}})"
id=
"favoriteButton"
>
<div
class=
"d-flex flex-column"
>
<span
class=
"star disable shopmember_{{shopMemberId}}"
onclick=
"Namecard.favoriteUserChange('{{shopMemberId}}',this)"
></span>
<span
class=
"star disable shopmember_{{shopMemberId}}"
onclick=
"Namecard.favoriteUserChange('{{shopMemberId}}',this)"
></span>
<span>
お気に入り登録
</span>
</div>
</button>
{{/isFavorite}}
{{#isHost}}
<button
type=
"button"
class=
"ch_host_btn border-0 bg_green text_white"
onclick=
"FermiWebSocketBridge.requestHostChange('{{collaborationId}}');"
>
<button
type=
"button"
class=
"ch_host_btn border-0 bg_green text_white"
data-toggle=
"modal"
data-target=
"#changeHostModal"
value=
"#profileModal2"
data-collaborationId=
'{{collaborationId}}'
>
<!-- onclick="FermiWebSocketBridge.requestHostChange('{{collaborationId}}');"> -->
<div
class=
"d-flex flex-column"
>
<div
class=
"img_wrap"
>
<img
src=
"icon/icon_change_host.svg"
alt=
"ホスト変更"
>
...
...
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