diff --git a/src/components/structures/RoomSubList.js b/src/components/structures/RoomSubList.js index fde35b12..577dac9c 100644 --- a/src/components/structures/RoomSubList.js +++ b/src/components/structures/RoomSubList.js @@ -82,7 +82,6 @@ var RoomSubList = React.createClass({ incomingCall: React.PropTypes.object, onShowMoreRooms: React.PropTypes.func, searchFilter: React.PropTypes.string, - emptyContent: React.PropTypes.node, // content shown if the list is empty }, getInitialState: function() { @@ -469,18 +468,16 @@ var RoomSubList = React.createClass({ render: function() { var connectDropTarget = this.props.connectDropTarget; + var RoomDropTarget = sdk.getComponent('rooms.RoomDropTarget'); var TruncatedList = sdk.getComponent('elements.TruncatedList'); var label = this.props.collapsed ? null : this.props.label; //console.log("render: " + JSON.stringify(this.state.sortedList)); - let content; - if (this.state.sortedList.length == 0) { - //content = <RoomDropTarget label={ 'Drop here to ' + this.props.verb }/>; - content = this.props.emptyContent; - } else { - content = this.makeRoomTiles(); + var target; + if (this.state.sortedList.length == 0 && this.props.editable) { + target = <RoomDropTarget label={ 'Drop here to ' + this.props.verb }/>; } var roomCount = this.props.list.length > 0 ? this.props.list.length : ''; @@ -500,7 +497,8 @@ var RoomSubList = React.createClass({ if (!this.state.hidden) { subList = <TruncatedList className={ classes } truncateAt={this.state.truncateAt} createOverflowElement={this._createOverflowTile} > - { content } + { target } + { this.makeRoomTiles() } </TruncatedList>; } else { diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/_RoomList.scss b/src/skins/vector/css/matrix-react-sdk/views/rooms/_RoomList.scss index e51b64f0..110dcd5b 100644 --- a/src/skins/vector/css/matrix-react-sdk/views/rooms/_RoomList.scss +++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/_RoomList.scss @@ -1,6 +1,5 @@ /* Copyright 2015, 2016 OpenMarket Ltd -Copyright 2107 Vector Creations Ltd Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -38,20 +37,3 @@ limitations under the License. .mx_RoomList_scrollbar .gm-scrollbar.-vertical { z-index: 6; } - -.mx_RoomList_emptySubListTip { - font-size: 13px; - margin-left: 18px; - margin-right: 18px; - margin-top: 8px; - margin-bottom: 7px; - padding: 5px; - border: 1px solid $accent-color; - color: $primary-fg-color; - background-color: $droptarget-bg-color; - border-radius: 4px; -} - -.mx_RoomList_butonPreview { - float: right; -}