OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Revert auxPanel changes (this should already have been fixed in a separate PR).

pull/21833/head
Richard Lewis 2017-08-21 15:29:11 +01:00
parent d7f5295949
commit b7569a9831
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/components/views/rooms/AuxPanel.js
View File

@ -129,10 +129,7 @@ module.exports = React.createClass({
); );
let appsDrawer = null; let appsDrawer = null;
let appCount = 0;
if(UserSettingsStore.isFeatureEnabled('matrix_apps') && this.props.showApps) { if(UserSettingsStore.isFeatureEnabled('matrix_apps') && this.props.showApps) {
const appsStateEvents = this.props.room.currentState.getStateEvents('im.vector.modular.widgets');
if (appsStateEvents) appCount = appsStateEvents.length;
appsDrawer = <AppsDrawer ref="appsDrawer" appsDrawer = <AppsDrawer ref="appsDrawer"
room={this.props.room} room={this.props.room}
userId={this.props.userId} userId={this.props.userId}
@ -140,7 +137,7 @@ module.exports = React.createClass({
} }
return ( return (
<div className={ appCount == 2 ? "mx_RoomView_auxPanel mx_RoomView_auxPanel_wide" : "mx_RoomView_auxPanel" } style={{maxHeight: this.props.maxHeight}} > <div className="mx_RoomView_auxPanel" style={{maxHeight: this.props.maxHeight}} >
{ appsDrawer } { appsDrawer }
{ fileDropTarget } { fileDropTarget }
{ callView } { callView }