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
f1563ade
Commit
f1563ade
authored
Aug 02, 2021
by
Kim Peace
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed show host mark and request s
parent
850dcd11
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
21 additions
and
7 deletions
+21
-7
public_new/js/views/collaboration/fermi-web-socket-bridge.js
+6
-2
public_new/js/views/collaboration/fermi-web-socket-message-handler.js
+7
-2
public_new/js/views/collaboration/share-event-listener.js
+8
-3
No files found.
public_new/js/views/collaboration/fermi-web-socket-bridge.js
View file @
f1563ade
...
...
@@ -46,10 +46,10 @@ FermiWebSocketBridge.hostRequestDone = function (hostID) {
// GET_COLLABORATION_TYPE_RESPONSE
FermiWebSocketBridge
.
getCollaborationTypeResponse
=
function
(
loginID
)
{
if
(
typeof
meetingID
==
undefined
)
{
if
(
typeof
meetingID
==
undefined
)
{
var
meetingID
=
0
;
}
fw
.
sendToMsg
(
"others"
,
"GET_COLLABORATION_TYPE_RESPONSE"
,
{
loginId
:
loginID
,
collaborationType
:
globalUserInfo
.
collaborationType
,
...
...
@@ -90,3 +90,7 @@ FermiWebSocketBridge.changeHostApply = function () {
hostId
:
globalUserInfo
.
loginId
,
});
};
FermiWebSocketBridge
.
hostUpdated
=
function
()
{
fw
.
sendToMsg
(
"others"
,
"HOST_UPDATED"
,
{});
};
public_new/js/views/collaboration/fermi-web-socket-message-handler.js
View file @
f1563ade
...
...
@@ -71,7 +71,7 @@ FermiWebSocketMessageHandler.handleMessagesToAll = function (data) {
case
"API_SEND_OWNER_CHANGE_COMPLETE"
:
FermiWebSocketMessageHandler
.
apiSendOwnerChangeComplete
(
data
);
CollaborationFeature
.
updateHost
();
FermiWebSocketBridge
.
hostUpdated
();
break
;
case
"API_SEND_OWNER_CHANGE_CONFIRM"
:
if
(
globalUserInfo
.
collaborationType
==
COLLABORATION_TYPE
.
CAMERA
)
{
...
...
@@ -98,6 +98,10 @@ FermiWebSocketMessageHandler.handleMessagesToAll = function (data) {
CollaborationFeature
.
updateHost
();
CollaborationUI
.
userListSlideOut
();
$
(
".profile_favorite_btn"
).
click
();
break
;
case
"HOST_UPDATED"
:
CollaborationFeature
.
updateHost
();
break
;
default
:
break
;
}
...
...
@@ -273,7 +277,8 @@ FermiWebSocketMessageHandler.getCollaborationType = function (data) {
// GET_COLLABORATION_TYPE_RESPONSE
FermiWebSocketMessageHandler
.
getCollaborationTypeResponse
=
function
(
data
)
{
const
collaborationType
=
data
.
payload
.
collaborationType
;
const
meetingID
=
data
.
payload
.
newMeetingId
;
const
meetingID
=
data
.
payload
.
newMeetingId
??
0
;
FermiWebSocketMessageHandler
.
updateJoinChangeCollaboration
(
collaborationType
);
globalUserInfo
.
meetingID
=
meetingID
;
CollaborationUI
.
updateScreen
(
globalUserInfo
.
collaborationType
);
...
...
public_new/js/views/collaboration/share-event-listener.js
View file @
f1563ade
...
...
@@ -235,7 +235,7 @@ CollaborationFeature.didReceivedJoinRoomInfoResponseMessage = function () {
};
CoviewBridge
.
changeHostFromModal
=
function
()
{
const
userID
=
$
(
"#changeHostModal"
).
data
(
"bs.modal"
).
_config
.
collaborationid
const
userID
=
$
(
"#changeHostModal"
).
data
(
"bs.modal"
).
_config
.
collaborationid
;
// call in agent_app.js
coview_api
.
HostChange
(
userID
);
};
...
...
@@ -301,10 +301,16 @@ CollaborationUI.hideHostButtons = function () {
CollaborationUI
.
showHostMark
=
function
(
hostName
)
{
// remove all host mark
attendingUsers
.
forEach
(
function
(
userName
)
{
// hide other user's video area
$
(
userName
).
hide
();
// remove host mark
const
user
=
"#collaboration_user_"
+
getReplacedLoginId
(
userName
);
$
(
user
).
removeClass
(
"host"
);
});
// show host video area
$
(
hostName
).
show
();
// set host name as current user if host name is not set
if
(
hostName
==
""
)
{
hostName
=
getReplacedLoginId
(
globalUserInfo
.
loginId
);
...
...
@@ -494,4 +500,4 @@ CollaborationUI.moveToVideoShareArea = function () {
CollaborationUI
.
showLoadingIndicator
();
$
(
".coview_share_area"
).
show
();
$
(
"#collabo_main"
).
removeClass
(
"none"
);
};
\ No newline at end of file
};
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