matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-06-26 04:01:04 +03:00
Code Activity

Get rid of always-on labs settings

Browse Source 
If the setting is on by default, it's not much use as a Labs setting. The E2e
setting was only confusing everyone anyway.
This commit is contained in:
Richard van der Hoff
2016-11-21 10:25:48 +00:00
parent 2e691240ae
commit 4476b09ce7
4 changed files with 28 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/components/views/messages/TextualBody.js
View File

@ -27,7 +27,6 @@ var sdk = require('../../../index');
var ScalarAuthClient = require("../../../ScalarAuthClient");
var Modal = require("../../../Modal");
var SdkConfig = require('../../../SdkConfig');
var UserSettingsStore = require('../../../UserSettingsStore');
linkifyMatrix(linkify);
@ -213,16 +212,6 @@ module.exports = React.createClass({
// which requires the user to click through and THEN we can open the link in a new tab because
// the window.open command occurs in the same stack frame as the onClick callback.
let integrationsEnabled = UserSettingsStore.isFeatureEnabled("integration_management");
if (!integrationsEnabled) {
var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
Modal.createDialog(ErrorDialog, {
title: "Integrations disabled",
description: "You need to enable the Labs option 'Integrations Management' in your Riot user settings first.",
});
return;
}
// Go fetch a scalar token
let scalarClient = new ScalarAuthClient();
scalarClient.connect().then(() => {
@ -304,4 +293,3 @@ module.exports = React.createClass({
}
},
});