gaja-group
/
element-web
forked from matrix/element-web
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use the SdkConfig interface 

rather than pulling in config.json directly.

json-loader appears to still be necessary due to some horrendous json dependency in the depths of sanitize-html.
This commit is contained in:
David Baker 2016-06-06 19:13:30 +01:00
parent c672919d1e
commit f9aaf7d903
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/components/views/settings/Notifications.js
View File

@ -21,7 +21,7 @@ var sdk = require('matrix-react-sdk');
var MatrixClientPeg = require('matrix-react-sdk/lib/MatrixClientPeg'); var MatrixClientPeg = require('matrix-react-sdk/lib/MatrixClientPeg');
var UserSettingsStore = require('matrix-react-sdk/lib/UserSettingsStore'); var UserSettingsStore = require('matrix-react-sdk/lib/UserSettingsStore');
var Modal = require('matrix-react-sdk/lib/Modal'); var Modal = require('matrix-react-sdk/lib/Modal');
var configJson = require("../../../../config.json"); var SdkConfig = require("matrix-react-sdk/lib/SdkConfig");
var notifications = require('../../../notifications'); var notifications = require('../../../notifications');
@ -118,8 +118,8 @@ module.exports = React.createClass({
var emailPusherPromise; var emailPusherPromise;
if (event.target.checked) { if (event.target.checked) {
var data = {} var data = {}
if (configJson.brand) { if (SdkConfig.get().brand) {
data['brand'] = configJson.brand; data['brand'] = SdkConfig.get().brand;
} }
emailPusherPromise = UserSettingsStore.addEmailPusher(address, data); emailPusherPromise = UserSettingsStore.addEmailPusher(address, data);
} else { } else {