Merge branch 'dev'
CI/CD / deploy (push) Failing after 2m32s
Details
CI/CD / deploy (push) Failing after 2m32s
Details
This commit is contained in:
commit
1d05e7b64f
|
|
@ -507,44 +507,48 @@ routes.get("/:room", (c) => {
|
|||
<div id="jitsi-container">
|
||||
<div class="loading"><div class="spinner"></div><span>Connecting to meeting...</span></div>
|
||||
</div>
|
||||
<script src="${escapeHtml(JITSI_URL)}/external_api.js"></script>
|
||||
<script src="${escapeHtml(JITSI_URL)}/external_api.min.js"></script>
|
||||
<script>
|
||||
const api = new JitsiMeetExternalAPI("${escapeHtml(JITSI_URL.replace(/^https?:\/\//, ""))}", {
|
||||
roomName: "${jitsiRoom}",
|
||||
parentNode: document.getElementById("jitsi-container"),
|
||||
width: "100%",
|
||||
height: "100%",
|
||||
configOverrides: {
|
||||
startWithAudioMuted: false,
|
||||
startWithVideoMuted: false,
|
||||
prejoinPageEnabled: true,
|
||||
disableDeepLinking: true,
|
||||
disableThirdPartyRequests: true,
|
||||
enableClosePage: false,
|
||||
disableInviteFunctions: false,
|
||||
toolbarButtons: [
|
||||
"microphone","camera","desktop","hangup",
|
||||
"raisehand","tileview","toggle-camera",
|
||||
"fullscreen","chat","settings",
|
||||
"participants-pane","select-background",
|
||||
],
|
||||
},
|
||||
interfaceConfigOverrides: {
|
||||
SHOW_JITSI_WATERMARK: false,
|
||||
SHOW_BRAND_WATERMARK: false,
|
||||
SHOW_POWERED_BY: false,
|
||||
MOBILE_APP_PROMO: false,
|
||||
HIDE_DEEP_LINKING_LOGO: true,
|
||||
DISABLE_JOIN_LEAVE_NOTIFICATIONS: false,
|
||||
},
|
||||
});
|
||||
api.addEventListener("readyToClose", function() {
|
||||
try { window.close(); } catch(e) {}
|
||||
// window.close() fails if the tab wasn't opened by JS (common on mobile)
|
||||
try {
|
||||
var api = new JitsiMeetExternalAPI("${escapeHtml(JITSI_URL.replace(/^https?:\/\//, ""))}", {
|
||||
roomName: decodeURIComponent("${jitsiRoom}"),
|
||||
parentNode: document.getElementById("jitsi-container"),
|
||||
width: "100%",
|
||||
height: "100%",
|
||||
configOverwrite: {
|
||||
startWithAudioMuted: false,
|
||||
startWithVideoMuted: false,
|
||||
prejoinConfig: { enabled: false },
|
||||
prejoinPageEnabled: false,
|
||||
disableDeepLinking: true,
|
||||
disableThirdPartyRequests: true,
|
||||
enableClosePage: false,
|
||||
toolbarButtons: [
|
||||
"microphone","camera","desktop","hangup",
|
||||
"raisehand","tileview","toggle-camera",
|
||||
"fullscreen","chat","settings",
|
||||
"participants-pane","select-background",
|
||||
],
|
||||
},
|
||||
interfaceConfigOverwrite: {
|
||||
SHOW_JITSI_WATERMARK: false,
|
||||
SHOW_BRAND_WATERMARK: false,
|
||||
SHOW_POWERED_BY: false,
|
||||
MOBILE_APP_PROMO: false,
|
||||
HIDE_DEEP_LINKING_LOGO: true,
|
||||
DISABLE_JOIN_LEAVE_NOTIFICATIONS: false,
|
||||
},
|
||||
});
|
||||
api.addEventListener("readyToClose", function() {
|
||||
try { window.close(); } catch(e) {}
|
||||
document.getElementById("jitsi-container").innerHTML =
|
||||
'<div class="ended"><span>Meeting ended</span>'
|
||||
+ '<a href="${escapeHtml(`/${space}/rmeets`)}">Back to rMeets</a></div>';
|
||||
});
|
||||
} catch(e) {
|
||||
document.getElementById("jitsi-container").innerHTML =
|
||||
'<div class="ended"><span>Meeting ended</span>'
|
||||
+ '<a href="${escapeHtml(`/${space}/rmeets`)}">Back to rMeets</a></div>';
|
||||
});
|
||||
'<div class="loading" style="color:#ef4444">Failed to connect: ' + e.message + '</div>';
|
||||
}
|
||||
</script>
|
||||
</body>
|
||||
</html>`);
|
||||
|
|
|
|||
Loading…
Reference in New Issue