協業参加

public_new/chat_room.html

@@ -113,13 +113,13 @@
             </a>
             </a>
           </div>
           </div>
           <div class="footer_item">
           <div class="footer_item">
-            <a href="collaboration_picture.html">
+            <a href="javascript:CHAT_UI.startCollaboration(collaborationType.CAMERA);">
               <img src="icon/icon_photo.png" alt="画像アイコン">
               <img src="icon/icon_photo.png" alt="画像アイコン">
               <p>画像</p>
               <p>画像</p>
             </a>
             </a>
           </div>
           </div>
           <div class="footer_item">
           <div class="footer_item">
-            <a href="collaboration_video.html">
+            <a href="javascript:CHAT_UI.startCollaboration(collaborationType.VIDEO);">
               <img src="icon/icon_movie.png" alt="動画アイコン">
               <img src="icon/icon_movie.png" alt="動画アイコン">
               <p>動画</p>
               <p>動画</p>
             </a>
             </a>

public_new/footer_collabo.html

@@ -16,7 +16,7 @@
         </a>
         </a>
       </div>
       </div>
       <div class="footer_item">
       <div class="footer_item">
-        <a href="chat_room.html">
+        <a href="javascript:Coview_exitCollaboration();">
           <div class="img_wrap bg_red">
           <div class="img_wrap bg_red">
             <img src="icon/icon_tell.png" alt="通話">
             <img src="icon/icon_tell.png" alt="通話">
           </div>
           </div>

public_new/js/chat-ui.js

@@ -2421,4 +2421,4 @@ CHAT_UI.startCollaboration = function(collaborationType) {
     } else if (CHAT_UTIL.isAndroid()) {
     } else if (CHAT_UTIL.isAndroid()) {
         android.startCollaboration(collaborationType);
         android.startCollaboration(collaborationType);
     }
     }
-}
+}
\ No newline at end of file

public_new/js/collaboration.js

@@ -76,6 +76,8 @@ $(function () {
 
 
   // ユーザー招待メンバー検索
   // ユーザー招待メンバー検索
   $(".add_user_btn").click(function () {
   $(".add_user_btn").click(function () {
+
+
     $("#overlay_add_user_list").removeClass("none");
     $("#overlay_add_user_list").removeClass("none");
     $.ajax({
     $.ajax({
       url: "collaboration_overlay_add_user_list.html",
       url: "collaboration_overlay_add_user_list.html",
@@ -84,6 +86,8 @@ $(function () {
     }).done(function (data) {
     }).done(function (data) {
       $("#add_user_list").html(data);
       $("#add_user_list").html(data);
     });
     });
+
+
   });
   });
 
 
   $('#penBtn').click(function () {
   $('#penBtn').click(function () {

public_new/js/share.js

@@ -202,3 +202,8 @@ function Coview_moveToVideoShareArea(){
     $(".coview_share_area").show();
     $(".coview_share_area").show();
     $('#collabo_main').removeClass('none');
     $('#collabo_main').removeClass('none');
 }
 }
+
+function Coview_exitCollaboration(){
+    coview_api.LeaveRoom();
+    CHAT_UI.joinRoom(CHAT.globalLoginParameter.roomId, CHAT.globalLoginParameter.name);
+}