Merge branch 'communication/bug-pip' into 'develop'

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

See merge request !165

public_new/js/share.js

@@ -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");
+    scrollLockON();
     $("#loadingIndicator").removeClass("full_active");
     $("#loadingIndicator").removeClass("full_active");
   });
   });
 
 
@@ -484,17 +485,28 @@ 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 scrollLock = 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
+      || $(e.target).closest('.pip_indicator').length > 0)
     {
     {
       e.stopPropagation();
       e.stopPropagation();
     } else {
     } else {
       e.preventDefault();
       e.preventDefault();
     }    
     }    
   }
   }
-}, {passive: false});
+}
+
+let collaboScreen = document.getElementById('collabo_main');
+
+function scrollLockON() {
+  collaboScreen.addEventListener('touchmove', scrollLock, {passive: false});
+}
+
+function scrollLockOFF() {
+  collaboScreen.removeEventListener('touchmove', scrollLock, {passive: false});
+}
 
 
 function initCollaborationUI(changeCollaborationType){
 function initCollaborationUI(changeCollaborationType){
   $('#coviewEraserCtrBtn').click();
   $('#coviewEraserCtrBtn').click();
@@ -564,6 +576,7 @@ function initCollaborationUI(changeCollaborationType){
 }
 }
 
 
 function Coview_exitCollaboration(isDocument = false) {
 function Coview_exitCollaboration(isDocument = false) {
+  scrollLockOFF();
   if (isDocument) {
   if (isDocument) {
     if (CHAT_UTIL.isIOS()) {
     if (CHAT_UTIL.isIOS()) {
       webkit.messageHandlers.exitMeetingRoom.postMessage({});
       webkit.messageHandlers.exitMeetingRoom.postMessage({});