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
1ee8ba00
Commit
1ee8ba00
authored
Jun 06, 2021
by
Kim Peace
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'communication/#43061_collaboration-scroll' into 'develop'
#43061 iOSで動画協業中にスクロールできるバグを修正 See merge request
!164
parents
08bb9ef0
6246ad3d
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
2 deletions
+13
-2
public_new/js/share.js
+13
-2
No files found.
public_new/js/share.js
View file @
1ee8ba00
...
@@ -484,6 +484,18 @@ function changeCollaboration(changeCollaborationType) {
...
@@ -484,6 +484,18 @@ function changeCollaboration(changeCollaborationType) {
fw
.
sendToMsg
(
'others'
,
'CHANGE_COLLABORATION'
,
{
"collaborationType"
:
changeCollaborationType
,
"newMeetingId"
:
newMeetingId
});
fw
.
sendToMsg
(
'others'
,
'CHANGE_COLLABORATION'
,
{
"collaborationType"
:
changeCollaborationType
,
"newMeetingId"
:
newMeetingId
});
}
}
document
.
addEventListener
(
'touchmove'
,
function
(
e
)
{
if
(
CHAT_UTIL
.
isIOS
())
{
if
(
$
(
e
.
target
).
closest
(
'.add_user_modal'
).
length
>
0
||
$
(
e
.
target
).
closest
(
'#overlay_user_list'
).
length
>
0
)
{
e
.
stopPropagation
();
}
else
{
e
.
preventDefault
();
}
}
},
{
passive
:
false
});
function
initCollaborationUI
(
changeCollaborationType
){
function
initCollaborationUI
(
changeCollaborationType
){
$
(
'#coviewEraserCtrBtn'
).
click
();
$
(
'#coviewEraserCtrBtn'
).
click
();
if
(
$
(
'.user_btn'
).
hasClass
(
"hide"
))
{
if
(
$
(
'.user_btn'
).
hasClass
(
"hide"
))
{
...
@@ -785,4 +797,4 @@ function captureAndShareImage(urls, changeHostName) {
...
@@ -785,4 +797,4 @@ function captureAndShareImage(urls, changeHostName) {
}
}
});
});
});
});
}
}
\ 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