diff options
author | Aldo Cortesi <aldo@nullcube.com> | 2014-09-15 12:37:52 +1200 |
---|---|---|
committer | Aldo Cortesi <aldo@nullcube.com> | 2014-09-15 12:37:52 +1200 |
commit | 563078df2473a2a65c1a408e4cb27e79c95b7c87 (patch) | |
tree | 0fcfbb6331032b73d07f969d9acfb8db8f893863 /web/src/js | |
parent | 2cefd05be934ded2fee61b10d93769e388f99230 (diff) | |
download | mitmproxy-563078df2473a2a65c1a408e4cb27e79c95b7c87.tar.gz mitmproxy-563078df2473a2a65c1a408e4cb27e79c95b7c87.tar.bz2 mitmproxy-563078df2473a2a65c1a408e4cb27e79c95b7c87.zip |
Client-side cleanup
- Remove grunt
- Formatting and spacing. There shall be 4 spaces in a tab. Not 3. Not
5. And 2 is right out.
Diffstat (limited to 'web/src/js')
-rw-r--r-- | web/src/js/footer.react.js | 8 | ||||
-rw-r--r-- | web/src/js/header.react.js | 29 | ||||
-rw-r--r-- | web/src/js/mitmproxy.react.js | 20 |
3 files changed, 28 insertions, 29 deletions
diff --git a/web/src/js/footer.react.js b/web/src/js/footer.react.js index 9b36d841..1b65e19d 100644 --- a/web/src/js/footer.react.js +++ b/web/src/js/footer.react.js @@ -2,8 +2,10 @@ var Footer = React.createClass({ render : function(){ - return (<footer> - <span className="label label-success">transparent mode</span> - </footer>); + return ( + <footer> + <span className="label label-success">transparent mode</span> + </footer> + ); } });
\ No newline at end of file diff --git a/web/src/js/header.react.js b/web/src/js/header.react.js index b204eeb8..85dc3106 100644 --- a/web/src/js/header.react.js +++ b/web/src/js/header.react.js @@ -1,17 +1,17 @@ /** @jsx React.DOM */ var MainMenu = React.createClass({ - render : function(){ + render: function(){ return (<div>Main Menu</div>); } }); var ToolsMenu = React.createClass({ - render : function(){ + render: function(){ return (<div>Tools Menu</div>); } }); var ReportsMenu = React.createClass({ - render : function(){ + render: function(){ return (<div>Reports Menu</div>); } }); @@ -36,7 +36,7 @@ var _Header_Entries = { var Header = React.createClass({ getInitialState: function(){ - return {active: "main"}; + return {active: "main"}; }, handleClick: function(active){ this.setState({active: active}); @@ -47,7 +47,6 @@ var Header = React.createClass({ console.log("File click"); }, render: function(){ - var header = []; for(var item in _Header_Entries){ var classes = this.state.active == item ? "active" : ""; @@ -58,16 +57,16 @@ var Header = React.createClass({ var menu = _Header_Entries[this.state.active].menu(); return ( <header> - <div className="title-bar"> - mitmproxy { this.props.settings.version } - </div> - <nav> - <a href="#" className="special" onClick={this.handleFileClick}> File </a> - {header} - </nav> - <div className="menu"> - { menu } - </div> + <div className="title-bar"> + mitmproxy { this.props.settings.version } + </div> + <nav> + <a href="#" className="special" onClick={this.handleFileClick}> File </a> + {header} + </nav> + <div className="menu"> + { menu } + </div> </header>); } });
\ No newline at end of file diff --git a/web/src/js/mitmproxy.react.js b/web/src/js/mitmproxy.react.js index cdb6221d..609d2014 100644 --- a/web/src/js/mitmproxy.react.js +++ b/web/src/js/mitmproxy.react.js @@ -19,15 +19,15 @@ var App = React.createClass({ this.setState({settings: settings.getAll()}); }, render: function () { - return ( - <div id="container"> - <Header settings={this.state.settings}/> - <div id="main"> - <this.props.activeRouteHandler settings={this.state.settings}/> + return ( + <div id="container"> + <Header settings={this.state.settings}/> + <div id="main"> + <this.props.activeRouteHandler settings={this.state.settings}/> + </div> + <Footer/> </div> - <Footer/> - </div> - ); + ); } }); @@ -44,20 +44,18 @@ var TrafficTable = React.createClass({ flowStore.addChangeListener(this.onFlowsChange); $.getJSON("/flows.json").success(function (flows) { - flows.forEach(function (flow, i) { window.setTimeout(function () { flowStore.addFlow(flow); }, _.random(i*400,i*400+1000)); }); - }.bind(this)); }, componentWillUnmount: function(){ this.state.flowStore.close(); }, onFlowsChange: function(event, flows){ - this.setState({flows: flows.getAll()}); + this.setState({flows: flows.getAll()}); }, render: function () { var flows = this.state.flows.map(function(flow){ |