OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Temp. revert unintended commit.

pull/21833/head
Richard Lewis 2018-02-26 13:32:27 +00:00
parent 14d52c9f25
commit 707e3f3382
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/IntegrationManager.js
View File

@ -19,8 +19,6 @@ import SdkConfig from './SdkConfig';
import ScalarMessaging from './ScalarMessaging'; import ScalarMessaging from './ScalarMessaging';
import ScalarAuthClient from './ScalarAuthClient'; import ScalarAuthClient from './ScalarAuthClient';
let currentRoomId = "!JWyCNPOtOmEXOylMBv:matrix.org";
if (!global.im) { if (!global.im) {
global.im = {}; global.im = {};
} }
@ -53,14 +51,13 @@ export default class IntegrationManager {
static async open(integType, integId, onClose) { static async open(integType, integId, onClose) {
await IntegrationManager._init(); await IntegrationManager._init();
const IntegrationsManager = sdk.getComponent("views.settings.IntegrationsManager"); const IntegrationsManager = sdk.getComponent("views.settings.IntegrationsManager");
console.warn("IM", global.im);
if (global.im.error || !(global.im.client && global.im.client.hasCredentials())) { if (global.im.error || !(global.im.client && global.im.client.hasCredentials())) {
console.error("Scalar error", global.im); console.error("Scalar error", global.im);
return; return;
} }
integType = 'type_' + integType; integType = 'type_' + integType;
console.warn("Launching integration manager", currentRoomId, integType, integId);
const src = (global.im.client && global.im.client.hasCredentials()) ? const src = (global.im.client && global.im.client.hasCredentials()) ?
// FIXME -- Currently broken. Get current room ID
global.im.client.getScalarInterfaceUrlForRoom( global.im.client.getScalarInterfaceUrlForRoom(
currentRoomId, currentRoomId,
integType, integType,