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
db2d2706
Commit
db2d2706
authored
Sep 09, 2021
by
Kim Peace
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'bug/#44334_recoding_related_in_collaboration' into debug/console_logs
parents
435d6dc8
9d625253
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
0 deletions
+5
-0
public_new/js/views/collaboration/fermi-web-socket-message-handler.js
+2
-0
public_new/js/views/collaboration/share-event-listener.js
+3
-0
No files found.
public_new/js/views/collaboration/fermi-web-socket-message-handler.js
View file @
db2d2706
...
@@ -115,6 +115,8 @@ FermiWebSocketMessageHandler.handleMessagesToAll = function (data) {
...
@@ -115,6 +115,8 @@ FermiWebSocketMessageHandler.handleMessagesToAll = function (data) {
if
(
globalUserInfo
.
joinType
!=
COLLABORATION_JOIN_TYPE
.
INVITED
)
{
if
(
globalUserInfo
.
joinType
!=
COLLABORATION_JOIN_TYPE
.
INVITED
)
{
FermiWebSocketMessageHandler
.
apiWelcome
();
FermiWebSocketMessageHandler
.
apiWelcome
();
}
else
{
}
else
{
// when collaboration type is invited it should be dm room also
roomInfo
.
roomType
=
ChatRoomType
.
DM
;
FermiWebSocketBridge
.
getCollaborationType
();
FermiWebSocketBridge
.
getCollaborationType
();
}
}
CollaborationFeature
.
updateHost
();
CollaborationFeature
.
updateHost
();
...
...
public_new/js/views/collaboration/share-event-listener.js
View file @
db2d2706
...
@@ -209,6 +209,9 @@ CollaborationFeature.didReceiveLoginResponseMessage = async function () {
...
@@ -209,6 +209,9 @@ CollaborationFeature.didReceiveLoginResponseMessage = async function () {
NativeBridgeDelegate
.
showPhotoSelection
();
NativeBridgeDelegate
.
showPhotoSelection
();
},
100
);
},
100
);
}
}
if
(
globalUserInfo
.
joinType
==
COLLABORATION_JOIN_TYPE
.
INVITED
)
{
roomInfo
.
roomType
=
ChatRoomType
.
DM
;
}
}
catch
(
err
)
{
}
catch
(
err
)
{
// if the user denied the permission, it goes back to chat room
// if the user denied the permission, it goes back to chat room
if
(
err
.
name
==
"NotAllowedError"
)
{
if
(
err
.
name
==
"NotAllowedError"
)
{
...
...
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