Commit 10cf7408 by Takatoshi Miura

iOS文書協業でPIPをドラッグできないバグを修正

parent fc1c9eec
...@@ -232,6 +232,7 @@ $(function () { ...@@ -232,6 +232,7 @@ $(function () {
coview_api.addEventListener("start", function () { coview_api.addEventListener("start", function () {
console.log("=============> START : share start"); console.log("=============> START : share start");
screenLockON();
$("#loadingIndicator").removeClass("full_active"); $("#loadingIndicator").removeClass("full_active");
}); });
...@@ -484,7 +485,7 @@ function changeCollaboration(changeCollaborationType) { ...@@ -484,7 +485,7 @@ 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) { var screenLock = function (e) {
if (CHAT_UTIL.isIOS()) { if (CHAT_UTIL.isIOS()) {
if ($(e.target).closest('.add_user_modal').length > 0 if ($(e.target).closest('.add_user_modal').length > 0
|| $(e.target).closest('#overlay_user_list').length > 0 || $(e.target).closest('#overlay_user_list').length > 0
...@@ -495,7 +496,17 @@ document.addEventListener('touchmove', function (e) { ...@@ -495,7 +496,17 @@ document.addEventListener('touchmove', function (e) {
e.preventDefault(); e.preventDefault();
} }
} }
}, {passive: false}); }
let screen = document.getElementById('collabo_main');
function screenLockON() {
screen.addEventListener('touchmove', screenLock, {passive: false});
}
function screenLockOFF() {
screen.removeEventListener('touchmove', screenLock, {passive: false});
}
function initCollaborationUI(changeCollaborationType){ function initCollaborationUI(changeCollaborationType){
$('#coviewEraserCtrBtn').click(); $('#coviewEraserCtrBtn').click();
...@@ -565,6 +576,7 @@ function initCollaborationUI(changeCollaborationType){ ...@@ -565,6 +576,7 @@ function initCollaborationUI(changeCollaborationType){
} }
function Coview_exitCollaboration(isDocument = false) { function Coview_exitCollaboration(isDocument = false) {
screenLockOFF();
if (isDocument) { if (isDocument) {
if (CHAT_UTIL.isIOS()) { if (CHAT_UTIL.isIOS()) {
webkit.messageHandlers.exitMeetingRoom.postMessage({}); webkit.messageHandlers.exitMeetingRoom.postMessage({});
......
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