diff --git a/src/components/views/dialogs/TextInputDialog.js b/src/components/views/dialogs/TextInputDialog.js
new file mode 100644
index 0000000000..3cda852449
--- /dev/null
+++ b/src/components/views/dialogs/TextInputDialog.js
@@ -0,0 +1,94 @@
+/*
+Copyright 2015, 2016 OpenMarket Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+var React = require("react");
+
+module.exports = React.createClass({
+ displayName: 'TextInputDialog',
+ propTypes: {
+ title: React.PropTypes.string,
+ description: React.PropTypes.string,
+ value: React.PropTypes.string,
+ button: React.PropTypes.string,
+ focus: React.PropTypes.bool,
+ onFinished: React.PropTypes.func.isRequired
+ },
+
+ getDefaultProps: function() {
+ return {
+ title: "",
+ value: "",
+ description: "",
+ button: "OK",
+ focus: true
+ };
+ },
+
+ componentDidMount: function() {
+ if (this.props.focus) {
+ // Set the cursor at the end of the text input
+ this.refs.textinput.value = this.props.value;
+ }
+ },
+
+ onOk: function() {
+ this.props.onFinished(true, this.refs.textinput.value);
+ },
+
+ onCancel: function() {
+ this.props.onFinished(false);
+ },
+
+ onKeyDown: function(e) {
+ if (e.keyCode === 27) { // escape
+ e.stopPropagation();
+ e.preventDefault();
+ this.props.onFinished(false);
+ }
+ else if (e.keyCode === 13) { // enter
+ e.stopPropagation();
+ e.preventDefault();
+ this.props.onFinished(true, this.refs.textinput.value);
+ }
+ },
+
+ render: function() {
+ return (
+
+
+ {this.props.title}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ );
+ }
+});
diff --git a/src/components/views/login/CustomServerDialog.js b/src/components/views/login/CustomServerDialog.js
index 8a67dfd7e6..dc6a49abd6 100644
--- a/src/components/views/login/CustomServerDialog.js
+++ b/src/components/views/login/CustomServerDialog.js
@@ -22,7 +22,7 @@ module.exports = React.createClass({
render: function() {
return (
-
+
Custom Server Options
diff --git a/src/components/views/rooms/RoomSettings.js b/src/components/views/rooms/RoomSettings.js
index 0ff15a4f43..284bee41c2 100644
--- a/src/components/views/rooms/RoomSettings.js
+++ b/src/components/views/rooms/RoomSettings.js
@@ -128,6 +128,10 @@ module.exports = React.createClass({
return this.refs.share_history.checked ? "shared" : "invited";
},
+ areNotificationsMuted: function() {
+ return this.refs.are_notifications_muted.checked;
+ },
+
getPowerLevels: function() {
if (!this.state.power_levels_changed) return undefined;
@@ -387,10 +391,19 @@ module.exports = React.createClass({
guest_access = guest_access.getContent().guest_access;
}
+ var are_notifications_muted;
+ var roomPushRule = MatrixClientPeg.get().getRoomPushRule("global", this.props.room.roomId);
+ if (roomPushRule) {
+ if (0 <= roomPushRule.actions.indexOf("dont_notify")) {
+ are_notifications_muted = true;
+ }
+ }
+
var events_levels = (power_levels ? power_levels.events : {}) || {};
var user_id = MatrixClientPeg.get().credentials.userId;
+
if (power_levels) {
power_levels = power_levels.getContent();
@@ -674,6 +687,11 @@ module.exports = React.createClass({
{ aliases_section }
+
Notifications
+
+
+
+
Permissions