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
f598d8fc
Commit
f598d8fc
authored
Aug 06, 2021
by
Kim Peace
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'bug/start_document_collaboration' into 'develop'
Fixed to use right meeting id See merge request
!224
parents
2917675a
9e738d87
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
5 deletions
+3
-5
public_new/js/views/chats/chat-room-message.js
+1
-1
public_new/js/views/collaboration/fermi-web-socket-bridge.js
+1
-3
public_new/js/views/collaboration/share-event-listener.js
+1
-1
No files found.
public_new/js/views/chats/chat-room-message.js
View file @
f598d8fc
...
...
@@ -284,7 +284,7 @@ ChatRoom.renderCollaborationMessage = function (message, isToday, isOtherYear) {
};
ChatRoom
.
getMeetingID
=
function
(
meetingID
)
{
return
typeof
meetingID
!
=
"undefined"
?
0
:
meetingID
;
return
typeof
meetingID
=
=
"undefined"
?
0
:
meetingID
;
};
ChatRoom
.
getDisplayUserList
=
function
(
userList
)
{
...
...
public_new/js/views/collaboration/fermi-web-socket-bridge.js
View file @
f598d8fc
...
...
@@ -45,9 +45,7 @@ FermiWebSocketBridge.hostRequestDone = function (hostID) {
// GET_COLLABORATION_TYPE_RESPONSE
FermiWebSocketBridge
.
getCollaborationTypeResponse
=
function
(
loginID
)
{
if
(
typeof
meetingID
==
undefined
)
{
var
meetingID
=
0
;
}
let
meetingID
=
globalUserInfo
.
meetingID
??
0
;
fw
.
sendToMsg
(
"others"
,
"GET_COLLABORATION_TYPE_RESPONSE"
,
{
loginId
:
loginID
,
...
...
public_new/js/views/collaboration/share-event-listener.js
View file @
f598d8fc
...
...
@@ -105,7 +105,7 @@ CoviewBridge.bindMessageEvent = function () {
}
switch
(
json
.
api
)
{
case
"LoginResponse"
:
CollaborationFeature
.
didReceiveLoginResponseMessage
();
await
CollaborationFeature
.
didReceiveLoginResponseMessage
();
break
;
case
"CreateRoomResponse"
:
if
(
json
.
resultCode
==
200
)
{
...
...
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