Fixed for collaboration

public_new/footer_collabo.html

@@ -59,7 +59,7 @@
         </a>
         </a>
       </div>
       </div>
       <div class="footer_item mx-md-3">
       <div class="footer_item mx-md-3">
-        <a href="javascript:CoviewBridge.exitCollaboration(isDocument);">
+        <a href="javascript:CoviewBridge.exitCollaboration();">
           <div class="img_wrap bg_red mx-1">
           <div class="img_wrap bg_red mx-1">
             <img src="icon/icon_close_white.png" alt="閉じる">
             <img src="icon/icon_close_white.png" alt="閉じる">
           </div>
           </div>

public_new/js/Models/coview-userinfo.js

@@ -38,9 +38,9 @@ var CoviewUserInfo = class {
       case COLLABORATION_TYPE.VIDEO:
       case COLLABORATION_TYPE.VIDEO:
         return COLLABORATION_TYPE.VIDEO;
         return COLLABORATION_TYPE.VIDEO;
       case COLLABORATION_TYPE.DOCUMENT:
       case COLLABORATION_TYPE.DOCUMENT:
-        return COLLABORATION_TYPE.DOCUMENT;
+        return COLLABORATION_TYPE.AUDIO;
       case COLLABORATION_TYPE.BOARD:
       case COLLABORATION_TYPE.BOARD:
-        return COLLABORATION_TYPE.BOARD;
+        return COLLABORATION_TYPE.AUDIO;
     }
     }
   }
   }
 
 

public_new/js/Models/deviceinfo.js

@@ -33,3 +33,6 @@ var DeviceInfo = class {
 };
 };
 
 
 var deviceInfo = new DeviceInfo(NativeBridgeDataSource.getDeviceInfo());
 var deviceInfo = new DeviceInfo(NativeBridgeDataSource.getDeviceInfo());
+
+// WARN:: this variable is only for use in coview. and should request not to use this.
+var isIos = deviceInfo.isiOS();

public_new/js/common/native-bridge-delegate.js

@@ -212,10 +212,11 @@ NativeBridgeDelegate.changeRoomName = function (newRoomName) {
 };
 };
 
 
 NativeBridgeDelegate.startCollaboration = function (type) {
 NativeBridgeDelegate.startCollaboration = function (type) {
+  const collaborationNumber = CHAT_UTIL.getCollaborationTypeNumber(type);
   if (deviceInfo.isiOS()) {
   if (deviceInfo.isiOS()) {
-    webkit.messageHandlers.startCollaboration.postMessage(type);
+    webkit.messageHandlers.startCollaboration.postMessage(collaborationNumber);
   } else if (deviceInfo.isAndroid()) {
   } else if (deviceInfo.isAndroid()) {
-    android.startCollaboration(type);
+    android.startCollaboration(collaborationNumber);
   }
   }
 };
 };
 
 
@@ -347,14 +348,19 @@ NativeBridgeDelegate.startContentView = function () {
   }
   }
 };
 };
 
 
-NativeBridgeDelegate.changeCollaboration = function (type, meetingID) {
+NativeBridgeDelegate.changeCollaboration = function (
+  collaborationType,
+  meetingID
+) {
+  const collaborationNumber =
+    CHAT_UTIL.getCollaborationTypeNumber(collaborationType);
   if (deviceInfo.isiOS()) {
   if (deviceInfo.isiOS()) {
     webkit.messageHandlers.changeCollaboration.postMessage({
     webkit.messageHandlers.changeCollaboration.postMessage({
-      changeCollaborationType: type,
+      changeCollaborationType: collaborationNumber,
       meetingId: meetingID,
       meetingId: meetingID,
     });
     });
   } else if (deviceInfo.isAndroid()) {
   } else if (deviceInfo.isAndroid()) {
-    android.changeCollaboration(type, meetingID);
+    android.changeCollaboration(collaborationNumber, meetingID);
   }
   }
 };
 };
 
 

public_new/js/views/collaboration/collaboration.js

@@ -29,8 +29,6 @@ document.addEventListener("DOMContentLoaded", function () {
  ********************************/
  ********************************/
 CollaborationUI.bindMenuButton = function () {
 CollaborationUI.bindMenuButton = function () {
   $(".menu_btn").click(function () {
   $(".menu_btn").click(function () {
-    var w = $(this).width();
-
     $(this).toggleClass("hide");
     $(this).toggleClass("hide");
     $("#overlay_menu .item").toggleClass("hide");
     $("#overlay_menu .item").toggleClass("hide");
   });
   });

public_new/js/views/collaboration/share.js

@@ -2,11 +2,9 @@
 /* Functions                                           */
 /* Functions                                           */
 /* --------------------------------------------------- */
 /* --------------------------------------------------- */
 let coview_api = new CoviewApi();
 let coview_api = new CoviewApi();
-var isDocument = false;
 var isBoard = false;
 var isBoard = false;
 let timeInterval = null;
 let timeInterval = null;
 var backgroundFileName;
 var backgroundFileName;
-var isIos;
 
 
 document.addEventListener("DOMContentLoaded", function () {
 document.addEventListener("DOMContentLoaded", function () {
   coview_api.Init({
   coview_api.Init({
@@ -153,8 +151,7 @@ function screenLock() {
   element.style.zIndex = "9999";
   element.style.zIndex = "9999";
   element.style.opacity = "0";
   element.style.opacity = "0";
 
 
-  const objBody = document.getElementsByTagName("body").item(0);
-  objBody.appendChild(element);
+  document.getElementsByTagName("body").item(0).appendChild(element);
 }
 }
 
 
 async function waitMillisecond(millesecond) {
 async function waitMillisecond(millesecond) {