Commit 5cf9fdbb by Takatoshi Miura

Merge branch 'communication/#43158_boad-area' into 'develop'

#43158_PIPの状態でボード協業に遷移するとボード領域が半分になるバグを修正

See merge request !177
parents c605edae e3a2e3bd
...@@ -133,9 +133,14 @@ document.addEventListener("DOMContentLoaded", function () { ...@@ -133,9 +133,14 @@ document.addEventListener("DOMContentLoaded", function () {
if (joinCollaborationType == COLLABORATION_TYPE.DOCUMENT) { if (joinCollaborationType == COLLABORATION_TYPE.DOCUMENT) {
if (CHAT_UTIL.isIOS()) { if (CHAT_UTIL.isIOS()) {
webkit.messageHandlers.exitMeetingRoom.postMessage({}); webkit.messageHandlers.exitMeetingRoom.postMessage({});
webkit.messageHandlers.finishPipMode.postMessage({});
} else if (CHAT_UTIL.isAndroid()) { } else if (CHAT_UTIL.isAndroid()) {
android.exitMeetingRoom(); android.exitMeetingRoom();
android.finishPip();
$(".pip_indicator").addClass("none");
} }
await new Promise(done => setTimeout(() => done(), 500));
updateCanvasSize();
} }
if ( if (
...@@ -234,7 +239,7 @@ document.addEventListener("DOMContentLoaded", function () { ...@@ -234,7 +239,7 @@ document.addEventListener("DOMContentLoaded", function () {
if (data.payload.loginId == globalUserInfo.loginId && joinCollaborationType == COLLABORATION_TYPE.DOCUMENT) { if (data.payload.loginId == globalUserInfo.loginId && joinCollaborationType == COLLABORATION_TYPE.DOCUMENT) {
if (CHAT_UTIL.isAndroid()) { if (CHAT_UTIL.isAndroid()) {
android.finishPip(); android.finishPip();
mChatWebView.loadUrl("javascript:$('.pip_indicator').addClass('none');"); $(".pip_indicator").addClass("none");
} else { } else {
webkit.messageHandlers.finishPipMode.postMessage({}); webkit.messageHandlers.finishPipMode.postMessage({});
} }
......
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