Matrix-Mirrors/schildi-web
1
0
Fork 0
mirror of https://github.com/SchildiChat/element-web.git synced 2024-10-01 01:26:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix bad merge

Browse Source
This commit is contained in:
Travis Ralston 2020-09-22 09:01:55 -06:00
parent 465a2ce314
commit c7617c2538
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/vector/jitsi/index.ts
View File

@ -18,7 +18,6 @@ limitations under the License.
require("./index.scss"); require("./index.scss");
import * as qs from 'querystring'; import * as qs from 'querystring';
import {Capability, WidgetApi} from 'matrix-react-sdk/src/widgets/WidgetApi';
import {KJUR} from 'jsrsasign'; import {KJUR} from 'jsrsasign';
import { import {
IWidgetApiRequest, IWidgetApiRequest,
@ -92,13 +91,14 @@ let widgetApi: WidgetApi;
roomId = qsParam('roomId', true); roomId = qsParam('roomId', true);
if (widgetApi) { if (widgetApi) {
await widgetApi.waitReady(); await readyPromise;
await widgetApi.setAlwaysOnScreen(false); // start off as detachable from the screen await widgetApi.setAlwaysOnScreen(false); // start off as detachable from the screen
// See https://github.com/matrix-org/prosody-mod-auth-matrix-user-verification // See https://github.com/matrix-org/prosody-mod-auth-matrix-user-verification
if (jitsiAuth === JITSI_OPENIDTOKEN_JWT_AUTH) { if (jitsiAuth === JITSI_OPENIDTOKEN_JWT_AUTH) {
// Request credentials, give callback to continue when received // Request credentials, give callback to continue when received
widgetApi.requestOpenIDCredentials(credentialsResponseCallback); // TODO: Implement in widget API
//widgetApi.requestOpenIDCredentials(credentialsResponseCallback);
} else { } else {
enableJoinButton(); enableJoinButton();
} }