diff --git a/skins/base/views/molecules/RoomHeader.js b/skins/base/views/molecules/RoomHeader.js
index 8b1a207545..8e0cadc218 100644
--- a/skins/base/views/molecules/RoomHeader.js
+++ b/skins/base/views/molecules/RoomHeader.js
@@ -67,6 +67,7 @@ module.exports = React.createClass({
var name = null;
var topic_el = null;
+ var cancel_button = null;
var save_button = null;
var settings_button = null;
var actual_name = this.props.room.currentState.getStateEvents('m.room.name', '');
@@ -77,6 +78,8 @@ module.exports = React.createClass({
// if (topic) topic_el =
+ cancel_button = Cancel
+ save_button = Save Changes
} else {
name =
@@ -102,6 +105,8 @@ module.exports = React.createClass({
{callButtons}
+ {cancel_button}
+ {save_button}
{ settings_button }
diff --git a/skins/base/views/molecules/RoomSettings.js b/skins/base/views/molecules/RoomSettings.js
index 27eb48de23..7f48df2056 100644
--- a/skins/base/views/molecules/RoomSettings.js
+++ b/skins/base/views/molecules/RoomSettings.js
@@ -207,12 +207,6 @@ module.exports = React.createClass({
);
})}
-
-
);
}
diff --git a/skins/base/views/organisms/RoomView.js b/skins/base/views/organisms/RoomView.js
index fe97a9c729..722a254fec 100644
--- a/skins/base/views/organisms/RoomView.js
+++ b/skins/base/views/organisms/RoomView.js
@@ -64,6 +64,10 @@ module.exports = React.createClass({
);
},
+ onCancelClick: function() {
+ this.setState(this.getInitialState());
+ },
+
getUnreadMessagesString: function() {
if (!this.state.numUnreadMessages) {
return "";
@@ -163,7 +167,7 @@ module.exports = React.createClass({
return (
+ onSettingsClick={this.onSettingsClick} onSaveClick={this.onSaveClick} onCancelClick={this.onCancelClick} />
{ roomEdit }