merge stuff from vector

2015-12-18 00:37:56 +00:00
parent 272d7362fb
commit e2ae2dd199
3 changed files with 205 additions and 70 deletions
--- a/src/components/views/rooms/RoomHeader.js
+++ b/src/components/views/rooms/RoomHeader.js
@@ -73,10 +73,15 @@ module.exports = React.createClass({

        var header;
        if (this.props.simpleHeader) {
+            var cancel;
+            if (this.props.onCancelClick) {
+                cancel = <img className="mx_RoomHeader_simpleHeaderCancel" src="img/cancel-black.png" 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>
        }