diff options
author | Aldo Cortesi <aldo@nullcube.com> | 2014-09-16 16:26:16 +1200 |
---|---|---|
committer | Aldo Cortesi <aldo@nullcube.com> | 2014-09-16 16:27:09 +1200 |
commit | 6efe1aa6a92ce7f9f264903e9d27fb5cf6c32bfe (patch) | |
tree | e654b27eeb7a44c61c0e1a43850966735aefb3cd /web/src/js/components | |
parent | 6bac1540bd9383c4e6e0510d9b75db34346187ed (diff) | |
download | mitmproxy-6efe1aa6a92ce7f9f264903e9d27fb5cf6c32bfe.tar.gz mitmproxy-6efe1aa6a92ce7f9f264903e9d27fb5cf6c32bfe.tar.bz2 mitmproxy-6efe1aa6a92ce7f9f264903e9d27fb5cf6c32bfe.zip |
We're not ready for ES6
Lets re-evaluate in June next year when it's actually released
Diffstat (limited to 'web/src/js/components')
-rw-r--r-- | web/src/js/components/eventlog.jsx (renamed from web/src/js/components/EventLog.react.js) | 17 | ||||
-rw-r--r-- | web/src/js/components/footer.jsx (renamed from web/src/js/components/Footer.react.js) | 4 | ||||
-rw-r--r-- | web/src/js/components/header.jsx (renamed from web/src/js/components/Header.react.js) | 18 | ||||
-rw-r--r-- | web/src/js/components/proxyapp.jsx (renamed from web/src/js/components/ProxyApp.react.js) | 20 | ||||
-rw-r--r-- | web/src/js/components/traffictable.jsx (renamed from web/src/js/components/TrafficTable.react.js) | 12 |
5 files changed, 36 insertions, 35 deletions
diff --git a/web/src/js/components/EventLog.react.js b/web/src/js/components/eventlog.jsx index 6c7a7c58..530e9f4f 100644 --- a/web/src/js/components/EventLog.react.js +++ b/web/src/js/components/eventlog.jsx @@ -1,31 +1,32 @@ /** @jsx React.DOM */ var EventLog = React.createClass({ - getInitialState() { + getInitialState: function() { return { log: [] }; }, - componentDidMount() { + componentDidMount: function() { this.log = EventLogStore.getView(); this.log.addListener("change", this.onEventLogChange); }, - componentWillUnmount() { + componentWillUnmount: function() { this.log.removeListener("change", this.onEventLogChange); this.log.close(); }, - onEventLogChange() { + onEventLogChange: function() { this.setState({ log: this.log.getAll() }); }, - close() { + close: function() { SettingsActions.update({ showEventLog: false }); }, - render() { - var messages = this.state.log.map(row => (<div key={row.id}>{row.message}</div>)); + render: function() { + //var messages = this.state.log.map(row => (<div key={row.id}>{row.message}</div>)); + var messages = []; return ( <div className="eventlog"> <pre> @@ -35,4 +36,4 @@ var EventLog = React.createClass({ </div> ); } -});
\ No newline at end of file +}); diff --git a/web/src/js/components/Footer.react.js b/web/src/js/components/footer.jsx index 20a4abfb..6d5b75a1 100644 --- a/web/src/js/components/Footer.react.js +++ b/web/src/js/components/footer.jsx @@ -1,7 +1,7 @@ /** @jsx React.DOM */ var Footer = React.createClass({ - render(){ + render: function(){ var mode = this.props.settings.mode; return ( <footer> @@ -9,4 +9,4 @@ var Footer = React.createClass({ </footer> ); } -});
\ No newline at end of file +}); diff --git a/web/src/js/components/Header.react.js b/web/src/js/components/header.jsx index 0131d350..e6350171 100644 --- a/web/src/js/components/Header.react.js +++ b/web/src/js/components/header.jsx @@ -1,12 +1,12 @@ /** @jsx React.DOM */ var MainMenu = React.createClass({ - toggleEventLog() { + toggleEventLog: function() { SettingsActions.update({ showEventLog: !this.props.settings.showEventLog }); }, - render(){ + render: function(){ return ( <div> <button className={"btn " + (this.props.settings.showEventLog ? "btn-primary" : "btn-default")} onClick={this.toggleEventLog}> @@ -17,12 +17,12 @@ var MainMenu = React.createClass({ } }); var ToolsMenu = React.createClass({ - render(){ + render: function(){ return <div>Tools Menu</div>; } }); var ReportsMenu = React.createClass({ - render(){ + render: function(){ return <div>Reports Menu</div>; } }); @@ -47,20 +47,20 @@ var _Header_Entries = { }; var Header = React.createClass({ - getInitialState(){ + getInitialState: function(){ return { active: "main" }; }, - handleClick(active){ + handleClick: function(active){ this.setState({active: active}); ReactRouter.transitionTo(_Header_Entries[active].route); return false; }, - handleFileClick(){ + handleFileClick: function(){ console.log("File click"); }, - render(){ + render: function(){ var header = []; for(var item in _Header_Entries){ var classes = this.state.active == item ? "active" : ""; @@ -86,4 +86,4 @@ var Header = React.createClass({ </header> ); } -});
\ No newline at end of file +}); diff --git a/web/src/js/components/ProxyApp.react.js b/web/src/js/components/proxyapp.jsx index 07d66440..c0196461 100644 --- a/web/src/js/components/ProxyApp.react.js +++ b/web/src/js/components/proxyapp.jsx @@ -2,33 +2,33 @@ //TODO: Move out of here, just a stub. var Reports = React.createClass({ - render(){ + render: function(){ return <div>Report Editor</div>; } }); var ProxyAppMain = React.createClass({ - getInitialState(){ + getInitialState: function(){ return { settings: SettingsStore.getAll() }; }, - componentDidMount(){ + componentDidMount: function(){ SettingsStore.addListener("change", this.onSettingsChange); }, - componentWillUnmount(){ + componentWillUnmount: function(){ SettingsStore.removeListener("change", this.onSettingsChange); }, - onSettingsChange(){ + onSettingsChange: function(){ console.log("onSettingsChange"); this.setState({settings: SettingsStore.getAll()}); }, - render() { + render: function() { return ( <div id="container"> - <Header settings={this.state.settings}/> - <div id="main"><this.props.activeRouteHandler/></div> - {this.state.settings.showEventLog ? <EventLog/> : null} - <Footer settings={this.state.settings}/> + <Header settings={this.state.settings}/> + <div id="main"><this.props.activeRouteHandler/></div> + {this.state.settings.showEventLog ? <EventLog/> : null} + <Footer settings={this.state.settings}/> </div> ); } diff --git a/web/src/js/components/TrafficTable.react.js b/web/src/js/components/traffictable.jsx index 7e9e26e3..1ed6fbc8 100644 --- a/web/src/js/components/TrafficTable.react.js +++ b/web/src/js/components/traffictable.jsx @@ -1,25 +1,25 @@ /** @jsx React.DOM */ var TrafficTable = React.createClass({ - getInitialState() { + getInitialState: function() { return { flows: [] }; }, - componentDidMount() { + componentDidMount: function() { //this.flowStore = FlowStore.getView(); //this.flowStore.addListener("change",this.onFlowChange); }, - componentWillUnmount() { + componentWillUnmount: function() { //this.flowStore.removeListener("change",this.onFlowChange); //this.flowStore.close(); }, - onFlowChange() { + onFlowChange: function() { this.setState({ //flows: this.flowStore.getAll() }); }, - render() { + render: function() { /*var flows = this.state.flows.map(function(flow){ return <div>{flow.request.method} {flow.request.scheme}://{flow.request.host}{flow.request.path}</div>; }); */ @@ -31,4 +31,4 @@ var TrafficTable = React.createClass({ <div><pre> { x } </pre></div> ); } -});
\ No newline at end of file +}); |