mad-star-studio/element-web
2
0
Fork 0
Code Pull requests Activity

Factor out logic from EnableNotificationsButton(!) and reuse MatrixToolbar.

Browse source 
Added notification logic to Notifier; dispatch notifier_enabled when toggled
so the toolbar can be shown/hidden and the button text can be kept in sync.
Add MatrixToolbar back into MatrixChat for notification nagging.
This commit is contained in:
Kegan Dougal 2015-07-21 15:47:56 +01:00
parent ed738b6398
commit c1de5e9e95
5 changed files with 95 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

3
skins/base/views/molecules/MatrixToolbar.js
View file

@ -32,8 +32,7 @@ module.exports = React.createClass({
render: function() {
return (
<div className="mx_MatrixToolbar">
<LogoutButton />
<EnableNotificationsButton />
You are not receiving desktop notifications. <EnableNotificationsButton />
</div>
);
}

8
skins/base/views/pages/MatrixChat.js
View file

@ -27,6 +27,8 @@ var UserSettings = ComponentBroker.get('organisms/UserSettings');
var Register = ComponentBroker.get('templates/Register');
var CreateRoom = ComponentBroker.get('organisms/CreateRoom');
var RoomDirectory = ComponentBroker.get('organisms/RoomDirectory');
var Notifier = ComponentBroker.get('organisms/Notifier');
var MatrixToolbar = ComponentBroker.get('molecules/MatrixToolbar');
var MatrixChatController = require("../../../../src/controllers/pages/MatrixChat");
@ -52,6 +54,11 @@ module.exports = React.createClass({
var page_element;
var right_panel = "";
var top_bar;
if (!Notifier.isEnabled()) {
top_bar = <MatrixToolbar />;
}
switch (this.state.page_type) {
case this.PageTypes.RoomView:
@ -74,6 +81,7 @@ module.exports = React.createClass({
return (
<div className="mx_MatrixChat">
{top_bar}
<LeftPanel selectedRoom={this.state.currentRoom} />
<div className="mx_MatrixChat_middlePanel">
{page_element}