Commit 52e466d4 by Kim Peace

Fixed for collaboration

parent a6846c4b
......@@ -59,7 +59,7 @@
</a>
</div>
<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">
<img src="icon/icon_close_white.png" alt="閉じる">
</div>
......
......@@ -38,9 +38,9 @@ var CoviewUserInfo = class {
case COLLABORATION_TYPE.VIDEO:
return COLLABORATION_TYPE.VIDEO;
case COLLABORATION_TYPE.DOCUMENT:
return COLLABORATION_TYPE.DOCUMENT;
return COLLABORATION_TYPE.AUDIO;
case COLLABORATION_TYPE.BOARD:
return COLLABORATION_TYPE.BOARD;
return COLLABORATION_TYPE.AUDIO;
}
}
......
......@@ -33,3 +33,6 @@ var DeviceInfo = class {
};
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();
......@@ -212,10 +212,11 @@ NativeBridgeDelegate.changeRoomName = function (newRoomName) {
};
NativeBridgeDelegate.startCollaboration = function (type) {
const collaborationNumber = CHAT_UTIL.getCollaborationTypeNumber(type);
if (deviceInfo.isiOS()) {
webkit.messageHandlers.startCollaboration.postMessage(type);
webkit.messageHandlers.startCollaboration.postMessage(collaborationNumber);
} 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()) {
webkit.messageHandlers.changeCollaboration.postMessage({
changeCollaborationType: type,
changeCollaborationType: collaborationNumber,
meetingId: meetingID,
});
} else if (deviceInfo.isAndroid()) {
android.changeCollaboration(type, meetingID);
android.changeCollaboration(collaborationNumber, meetingID);
}
};
......
......@@ -29,8 +29,6 @@ document.addEventListener("DOMContentLoaded", function () {
********************************/
CollaborationUI.bindMenuButton = function () {
$(".menu_btn").click(function () {
var w = $(this).width();
$(this).toggleClass("hide");
$("#overlay_menu .item").toggleClass("hide");
});
......
......@@ -2,11 +2,9 @@
/* Functions */
/* --------------------------------------------------- */
let coview_api = new CoviewApi();
var isDocument = false;
var isBoard = false;
let timeInterval = null;
var backgroundFileName;
var isIos;
document.addEventListener("DOMContentLoaded", function () {
coview_api.Init({
......@@ -153,8 +151,7 @@ function screenLock() {
element.style.zIndex = "9999";
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) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment