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

Merge pull request #1609 from vector-im/dbkr/SdkConfig 

Don't use SdkConfig
pull/1615/head
David Baker 2016-06-08 17:34:18 +01:00
parent ed1554f4af 1e40fd750f
commit b3ae9cc9d4
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/components/views/settings/Notifications.js
View File

@ -21,7 +21,6 @@ var sdk = require('matrix-react-sdk');
var MatrixClientPeg = require('matrix-react-sdk/lib/MatrixClientPeg');
var UserSettingsStore = require('matrix-react-sdk/lib/UserSettingsStore');
var Modal = require('matrix-react-sdk/lib/Modal');
var SdkConfig = require("matrix-react-sdk/lib/SdkConfig");
var notifications = require('../../../notifications');
@ -73,6 +72,8 @@ module.exports = React.createClass({
propTypes: {
// The array of threepids from the JS SDK (required for email notifications)
threepids: React.PropTypes.array.isRequired,
// The brand string set when creating an email pusher
brand: React.PropTypes.string,
},
getDefaultProps: function() {
@ -118,8 +119,8 @@ module.exports = React.createClass({
var emailPusherPromise;
if (event.target.checked) {
var data = {}
if (SdkConfig.get().brand) {
data['brand'] = SdkConfig.get().brand;
if (this.props.brand) {
data['brand'] = this.props.brand;
}
emailPusherPromise = UserSettingsStore.addEmailPusher(address, data);
} else {