Don't show widgets when editing room settings and lint fixes.

This commit is contained in:
Richard Lewis 2017-06-27 17:39:29 +01:00
parent 7a7687699b
commit 8dfd047f03

View file

@ -47,13 +47,12 @@ import UserProvider from '../../autocomplete/UserProvider';
import RoomViewStore from '../../stores/RoomViewStore'; import RoomViewStore from '../../stores/RoomViewStore';
var DEBUG = false; const DEBUG = false;
let debuglog = function() {};
if (DEBUG) { if (DEBUG) {
// using bind means that we get to keep useful line numbers in the console // using bind means that we get to keep useful line numbers in the console
var debuglog = console.log.bind(console); debuglog = console.log.bind(console);
} else {
var debuglog = function() {};
} }
module.exports = React.createClass({ module.exports = React.createClass({
@ -1623,7 +1622,7 @@ module.exports = React.createClass({
displayConfCallNotification={this.state.displayConfCallNotification} displayConfCallNotification={this.state.displayConfCallNotification}
maxHeight={this.state.auxPanelMaxHeight} maxHeight={this.state.auxPanelMaxHeight}
onResize={this.onChildResize} onResize={this.onChildResize}
showApps={this.state.showApps} > showApps={this.state.showApps && !this.state.editingRoomSettings} >
{ aux } { aux }
</AuxPanel> </AuxPanel>
); );