imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Pass SimpleRoomHeader title in as a named property

Browse source 
... rather than a child
This commit is contained in:
Richard van der Hoff 2016-03-29 23:21:17 +01:00
parent 0d261c37c2
commit 1f2ba87ff5
3 changed files with 11 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/components/structures/CreateRoom.js
View file

@ -255,9 +255,7 @@ module.exports = React.createClass({
return ( return (
<div className="mx_CreateRoom"> <div className="mx_CreateRoom">
<SimpleRoomHeader> <SimpleRoomHeader title="CreateRoom" />
Create room
</SimpleRoomHeader>
<div className="mx_CreateRoom_body"> <div className="mx_CreateRoom_body">
<input type="text" ref="room_name" value={this.state.room_name} onChange={this.onNameChange} placeholder="Name"/> <br /> <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 /> <textarea className="mx_CreateRoom_description" ref="topic" value={this.state.topic} onChange={this.onTopicChange} placeholder="Topic"/> <br />

4
src/components/structures/UserSettings.js
View file

@ -331,9 +331,7 @@ module.exports = React.createClass({
return ( return (
<div className="mx_UserSettings"> <div className="mx_UserSettings">
<SimpleRoomHeader> <SimpleRoomHeader title="Settings"/>
Settings
</SimpleRoomHeader>
<GeminiScrollbar className="mx_UserSettings_body" autoshow={true}> <GeminiScrollbar className="mx_UserSettings_body" autoshow={true}>

19
src/components/views/rooms/SimpleRoomHeader.js
View file

@ -25,19 +25,18 @@ var React = require('react');
module.exports = React.createClass({ module.exports = React.createClass({
displayName: 'SimpleRoomHeader', displayName: 'SimpleRoomHeader',
render: function() { propTypes: {
var cancel; title: React.PropTypes.string,
var header = ( },
<div className="mx_RoomHeader_wrapper">
<div className="mx_RoomHeader_simpleHeader">
{ this.props.children }
</div>
</div>
);
render: function() {
return ( return (
<div className="mx_RoomHeader" > <div className="mx_RoomHeader" >
{ header } <div className="mx_RoomHeader_wrapper">
<div className="mx_RoomHeader_simpleHeader">
{ this.props.title }
</div>
</div>
</div> </div>
); );
}, },