Merge branch 'bug/#44046_1on1_from_contact' into 'develop'

Bug/#44046 1on1 from contact

See merge request !244

public_new/collaboration_overlay_menu.html

@@ -6,7 +6,7 @@
           <div class="item hide rounded-circle shadow m-2 item01">
             <span class="item-overlay rounded-circle collaboration_contents voice_contents"></span>
             <a href="javascript:changeCollaboration(COLLABORATION_TYPE.AUDIO);"
-               class="d-flex flex-column align-items-center">
+              class="d-flex flex-column align-items-center">
               <div class="img_wrap">
                 <img src="icon/icon_collabo_headset.svg" alt="音声共有">
               </div>
@@ -16,7 +16,7 @@
           <div class="item hide rounded-circle shadow m-2 item02">
             <span class="item-overlay rounded-circle collaboration_contents video_contents"></span>
             <a href="javascript:changeCollaboration(COLLABORATION_TYPE.VIDEO);"
-               class="d-flex flex-column align-items-center">
+              class="d-flex flex-column align-items-center">
               <div class="img_wrap m-0">
                 <img src="icon/icon_collabo_videocam.svg" alt="動画共有">
               </div>
@@ -26,7 +26,7 @@
           <div class="item hide rounded-circle shadow m-2 item03">
             <span class="item-overlay rounded-circle collaboration_contents picture_contents"></span>
             <a href="javascript:changeCollaboration(COLLABORATION_TYPE.CAMERA);"
-               class="d-flex flex-column align-items-center">
+              class="d-flex flex-column align-items-center">
               <div class="img_wrap">
                 <img src="icon/icon_collabo_picture.svg" alt="写真共有">
               </div>
@@ -36,7 +36,7 @@
           <div class="item hide rounded-circle shadow m-2 item04">
             <span class="item-overlay rounded-circle collaboration_contents document_contents"></span>
             <a href="javascript:changeCollaboration(COLLABORATION_TYPE.DOCUMENT);"
-               class="d-flex flex-column align-items-center">
+              class="d-flex flex-column align-items-center">
               <div class="img_wrap">
                 <img src="icon/icon_collabo_document.svg" alt="文書共有">
               </div>
@@ -46,7 +46,7 @@
           <div class="item hide rounded-circle shadow m-2 item05">
             <span class="item-overlay rounded-circle collaboration_contents board_contents"></span>
             <a href="javascript:changeCollaboration(COLLABORATION_TYPE.BOARD);"
-               class="d-flex flex-column align-items-center">
+              class="d-flex flex-column align-items-center">
               <div class="img_wrap m-0">
                 <img src="icon/icon_collabo_whiteboard.svg" alt="落書き">
               </div>

public_new/js/common/common.js

@@ -73,7 +73,6 @@ document.addEventListener("DOMContentLoaded", function () {
 });
 
 document.addEventListener("readystatechange", () => {
-  
   switch (document.readyState) {
     case "interactive":
       break;
@@ -146,7 +145,12 @@ Common.getProfileImgUrl = function (path) {
       if (receivedString == "" || receivedString == undefined) {
         return Common.generateProfileImgURLFromServer(userInfo[0], userInfo[1]);
       }
-      return "data:image/"+userInfo[0].split('.').pop()+";base64," + receivedString;
+      return (
+        "data:image/" +
+        userInfo[0].split(".").pop() +
+        ";base64," +
+        receivedString
+      );
     }
     return Common.generateProfileImgURLFromServer(userInfo[0], userInfo[1]);
   } else {
@@ -186,7 +190,9 @@ Common.startCollaboration = function (collaborationType) {
     }
   }
 
-  CHAT_SOCKET.emitCollaborationFinishMessage();
+  if (typeof CHAT_SOCKET != "undefined") {
+    CHAT_SOCKET.emitCollaborationFinishMessage();
+  }
   NativeBridgeDelegate.finishAllCollaboration();
   NativeBridgeDelegate.startCollaboration(collaborationType);
   Common.dismissLoadingIndicator();