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

Merge pull request #299 from matrix-org/dbkr/SdkConfig 

Pass brand parameter down to Notifications
pull/21833/head
David Baker 2016-06-08 17:34:10 +01:00
parent aca0e060a4 7e8c8dd336
commit b5ff247f09
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/structures/MatrixChat.js
View File

@ -1092,7 +1092,7 @@ module.exports = React.createClass({
right_panel = <RightPanel roomId={this.state.currentRoom} collapsed={this.state.collapse_rhs} opacity={this.state.sideOpacity} /> right_panel = <RightPanel roomId={this.state.currentRoom} collapsed={this.state.collapse_rhs} opacity={this.state.sideOpacity} />
break; break;
case this.PageTypes.UserSettings: case this.PageTypes.UserSettings:
page_element = <UserSettings onClose={this.onUserSettingsClose} version={this.state.version} /> page_element = <UserSettings onClose={this.onUserSettingsClose} version={this.state.version} brand={this.props.config.brand} />
right_panel = <RightPanel collapsed={this.state.collapse_rhs} opacity={this.state.sideOpacity}/> right_panel = <RightPanel collapsed={this.state.collapse_rhs} opacity={this.state.sideOpacity}/>
break; break;
case this.PageTypes.CreateRoom: case this.PageTypes.CreateRoom:

6
src/components/structures/UserSettings.js
View File

@ -31,7 +31,9 @@ module.exports = React.createClass({
propTypes: { propTypes: {
version: React.PropTypes.string, version: React.PropTypes.string,
onClose: React.PropTypes.func onClose: React.PropTypes.func,
// The brand string given when creating email pushers
brand: React.PropTypes.string,
}, },
getDefaultProps: function() { getDefaultProps: function() {
@ -333,7 +335,7 @@ module.exports = React.createClass({
<h3>Notifications</h3> <h3>Notifications</h3>
<div className="mx_UserSettings_section"> <div className="mx_UserSettings_section">
<Notifications threepids={this.state.threepids} /> <Notifications threepids={this.state.threepids} brand={this.props.brand} />
</div> </div>
</div>); </div>);
} }