Merge branch 'feature/photo_collaboration_piucture_select_button' into 'develop'

Feature/photo collaboration piucture select button

See merge request !129

public_new/collaboration_picture.html

@@ -79,6 +79,13 @@
     <button type="button" name="button" class="footer_menu_btn"></button>
     <button type="button" name="button" class="footer_menu_btn"></button>
     <div class="footer_menu-wrap d-flex justify-content-around h-100">
     <div class="footer_menu-wrap d-flex justify-content-around h-100">
       <div class="d-flex align-items-center h-100">
       <div class="d-flex align-items-center h-100">
+        <div class="footer_menu_item photo_select_button host_contents">
+          <a href="#">
+            <div class="img_wrap bg_blue" id="photo_open_place_holder">
+              <img src="icon/icon_collabo_picture.png" alt="写真">
+            </div>
+          </a>
+        </div>
         <div class="footer_menu_item">
         <div class="footer_menu_item">
           <a href="#">
           <a href="#">
             <div class="img_wrap bg_red" id="penBtn">
             <div class="img_wrap bg_red" id="penBtn">
@@ -198,4 +205,4 @@
     };
     };
   </script>
   </script>
 </body>
 </body>
-</html>
+</html>
\ No newline at end of file

public_new/js/collaboration.js

@@ -100,6 +100,10 @@ $(function () {
         $('#penBtn').removeClass('bg_blue');
         $('#penBtn').removeClass('bg_blue');
     }
     }
   })
   })
+  
+  $('#photo_open_place_holder').click(function () {
+      $("#open_file_upload").trigger("click");
+  })
 
 
   $('#eraserBtn').click(function () {
   $('#eraserBtn').click(function () {
     $('#coviewEraserCtrBtn').click();
     $('#coviewEraserCtrBtn').click();

public_new/js/share.js

@@ -161,7 +161,6 @@ $(function () {
         console.log("------------------------------");
         console.log("------------------------------");
         console.log(globalUserInfo.coWorkType);
         console.log(globalUserInfo.coWorkType);
         console.log(collaborationJoinFlg);
         console.log(collaborationJoinFlg);
-        hostSearchInterval();
         if (globalUserInfo.coWorkType == collaborationTypeKey.DOCUMENT) {
         if (globalUserInfo.coWorkType == collaborationTypeKey.DOCUMENT) {
           isDocument = true;
           isDocument = true;
           globalUserInfo.coWorkType = collaborationTypeKey.AUDIO;
           globalUserInfo.coWorkType = collaborationTypeKey.AUDIO;
@@ -170,6 +169,7 @@ $(function () {
           isBoard = true;
           isBoard = true;
           globalUserInfo.coWorkType = collaborationTypeKey.CAMERA;
           globalUserInfo.coWorkType = collaborationTypeKey.CAMERA;
         }
         }
+        hostSearchInterval();
         if (collaborationJoinFlg == "1") {
         if (collaborationJoinFlg == "1") {
           coview_api.JoinRoom(globalUserInfo.roomId, globalUserInfo.coWorkType);
           coview_api.JoinRoom(globalUserInfo.roomId, globalUserInfo.coWorkType);
           if (isDocument) {
           if (isDocument) {
@@ -369,6 +369,11 @@ function Coview_connect_audio_collaboration() {
 
 
 function hostSearchInterval() {
 function hostSearchInterval() {
   let hostName = "";
   let hostName = "";
+  if (g_isMainMan) {
+      $('.host_contents').removeClass('none');
+  } else {
+      $('.host_contents').addClass('none');
+  }
   function hostSearch() {
   function hostSearch() {
     if (hostName != g_isMainManUsername) {
     if (hostName != g_isMainManUsername) {
       if (hostName != "") {
       if (hostName != "") {
@@ -386,11 +391,6 @@ function hostSearchInterval() {
           $("#collaboration_user_" + hostName).addClass("host");
           $("#collaboration_user_" + hostName).addClass("host");
         }
         }
 
 
-        if (g_isMainMan) {
-            $('.host_contents').removeClass('none');
-        } else {
-            $('.host_contents').addClass('none');
-        }
       }
       }
     }
     }
   }
   }