Commit 1ee8ba00 by Kim Peace

Merge branch 'communication/#43061_collaboration-scroll' into 'develop'

#43061 iOSで動画協業中にスクロールできるバグを修正

See merge request !164
parents 08bb9ef0 6246ad3d
...@@ -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
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment