diff options
Diffstat (limited to 'web/src/js/components')
| -rw-r--r-- | web/src/js/components/eventlog.jsx | 15 | ||||
| -rw-r--r-- | web/src/js/components/proxyapp.jsx | 2 |
2 files changed, 6 insertions, 11 deletions
diff --git a/web/src/js/components/eventlog.jsx b/web/src/js/components/eventlog.jsx index 340de8bd..32fc01ee 100644 --- a/web/src/js/components/eventlog.jsx +++ b/web/src/js/components/eventlog.jsx @@ -1,6 +1,7 @@ /** @jsx React.DOM */ var EventLog = React.createClass({ + mixins:[AutoScrollMixin], getInitialState: function () { return { log: [] @@ -25,15 +26,9 @@ var EventLog = React.createClass({ }); }, render: function () { - //var messages = this.state.log.map(row => (<div key={row.id}>{row.message}</div>)); - var messages = []; - return ( - <div className="eventlog"> - <pre> - <i className="fa fa-close close-button" onClick={this.close}></i> - {messages} - </pre> - </div> - ); + var messages = this.state.log.map(function(row) { + return (<div key={row.id}>{row.message}</div>); + }); + return <pre className="eventlog">{messages}</pre>; } }); diff --git a/web/src/js/components/proxyapp.jsx b/web/src/js/components/proxyapp.jsx index fff1d8d0..2f1a9861 100644 --- a/web/src/js/components/proxyapp.jsx +++ b/web/src/js/components/proxyapp.jsx @@ -27,7 +27,7 @@ var ProxyAppMain = React.createClass({ <div id="container"> <Header settings={this.state.settings}/> <div id="main"><this.props.activeRouteHandler/></div> - {this.state.settings.showEventLog ? <EventLog/> : null} + {this.state.settings.showEventLog ? <EventLog/> : null} <Footer settings={this.state.settings}/> </div> ); |