Factor out SimpleRoomHeader

Start cleaning up RoomHeader by factoring out a separate SimpleRoomHeader.

src/component-index.js

@@ -90,6 +90,7 @@ module.exports.components['views.rooms.RoomSettings'] = require('./components/vi
 module.exports.components['views.rooms.RoomTile'] = require('./components/views/rooms/RoomTile');
 module.exports.components['views.rooms.SearchableEntityList'] = require('./components/views/rooms/SearchableEntityList');
 module.exports.components['views.rooms.SearchResultTile'] = require('./components/views/rooms/SearchResultTile');
+module.exports.components['views.rooms.SimpleRoomHeader'] = require('./components/views/rooms/SimpleRoomHeader');
 module.exports.components['views.rooms.TabCompleteBar'] = require('./components/views/rooms/TabCompleteBar');
 module.exports.components['views.rooms.TopUnreadMessagesBar'] = require('./components/views/rooms/TopUnreadMessagesBar');
 module.exports.components['views.rooms.UserTile'] = require('./components/views/rooms/UserTile');

src/components/structures/CreateRoom.js

@@ -249,13 +249,15 @@ module.exports = React.createClass({
             var RoomAlias = sdk.getComponent("create_room.RoomAlias");
             var Presets = sdk.getComponent("create_room.Presets");
             var UserSelector = sdk.getComponent("elements.UserSelector");
-            var RoomHeader = sdk.getComponent("rooms.RoomHeader");
+            var SimpleRoomHeader = sdk.getComponent("rooms.SimpleRoomHeader");
 
             var domain = MatrixClientPeg.get().getDomain();
 
             return (
             <div className="mx_CreateRoom">
-                <RoomHeader simpleHeader="Create room" />
+                <SimpleRoomHeader>
+                    Create room
+                </SimpleRoomHeader>
                 <div className="mx_CreateRoom_body">
                     <input type="text" ref="room_name" value={this.state.room_name} onChange={this.onNameChange} placeholder="Name"/> <br />
                     <textarea className="mx_CreateRoom_description" ref="topic" value={this.state.topic} onChange={this.onTopicChange} placeholder="Topic"/> <br />

src/components/structures/UserSettings.js

@@ -249,7 +249,7 @@ module.exports = React.createClass({
                 throw new Error("Unknown state.phase => " + this.state.phase);
         }
         // can only get here if phase is UserSettings.DISPLAY
-        var RoomHeader = sdk.getComponent('rooms.RoomHeader');
+        var SimpleRoomHeader = sdk.getComponent('rooms.SimpleRoomHeader');
         var ChangeDisplayName = sdk.getComponent("views.settings.ChangeDisplayName");
         var ChangePassword = sdk.getComponent("views.settings.ChangePassword");
         var ChangeAvatar = sdk.getComponent('settings.ChangeAvatar');
@@ -331,7 +331,9 @@ module.exports = React.createClass({
 
         return (
             <div className="mx_UserSettings">
-                <RoomHeader simpleHeader="Settings" />
+                <SimpleRoomHeader>
+                    Settings
+                </SimpleRoomHeader>
 
                 <GeminiScrollbar className="mx_UserSettings_body" autoshow={true}>
 

src/components/views/rooms/RoomHeader.js

@@ -128,20 +128,6 @@ module.exports = React.createClass({
         var TintableSvg = sdk.getComponent("elements.TintableSvg");
 
         var header;
-        if (this.props.simpleHeader) {
-            var cancel;
-            if (this.props.onCancelClick) {
-                cancel = <img className="mx_RoomHeader_simpleHeaderCancel" src="img/cancel.svg" onClick={ this.props.onCancelClick } alt="Close" width="18" height="18"/>
-            }
-            header =
-                <div className="mx_RoomHeader_wrapper">
-                    <div className="mx_RoomHeader_simpleHeader">
-                        { this.props.simpleHeader }
-                        { cancel }
-                    </div>
-                </div>
-        }
-        else {
         var name = null;
         var searchStatus = null;
         var topic_el = null;
@@ -306,8 +292,7 @@ module.exports = React.createClass({
                 {save_button}
                 {cancel_button}
                 {right_row}
-                </div>
+            </div>;
-        }
 
         return (
             <div className={ "mx_RoomHeader " + (this.props.editing ? "mx_RoomHeader_editing" : "") }>

src/components/views/rooms/SimpleRoomHeader.js

@@ -0,0 +1,45 @@
+/*
+Copyright 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.
+*/
+
+'use strict';
+
+var React = require('react');
+
+/*
+ * A stripped-down room header used for things like the user settings
+ * and room directory.
+ */
+module.exports = React.createClass({
+    displayName: 'SimpleRoomHeader',
+
+    render: function() {
+        var cancel;
+        var header = (
+            <div className="mx_RoomHeader_wrapper">
+                <div className="mx_RoomHeader_simpleHeader">
+                    { this.props.children }
+                </div>
+            </div>
+        );
+
+        return (
+            <div className="mx_RoomHeader" >
+                { header }
+            </div>
+        );
+    },
+});
+