aboutsummaryrefslogtreecommitdiffstats
path: root/libmproxy/web
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@nullcube.com>2014-09-15 12:37:52 +1200
committerAldo Cortesi <aldo@nullcube.com>2014-09-15 12:37:52 +1200
commit563078df2473a2a65c1a408e4cb27e79c95b7c87 (patch)
tree0fcfbb6331032b73d07f969d9acfb8db8f893863 /libmproxy/web
parent2cefd05be934ded2fee61b10d93769e388f99230 (diff)
downloadmitmproxy-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 'libmproxy/web')
-rw-r--r--libmproxy/web/static/js/app.js22
1 files changed, 10 insertions, 12 deletions
diff --git a/libmproxy/web/static/js/app.js b/libmproxy/web/static/js/app.js
index 8dada810..eeb6e5dd 100644
--- a/libmproxy/web/static/js/app.js
+++ b/libmproxy/web/static/js/app.js
@@ -206,15 +206,15 @@ var App = React.createClass({displayName: 'App',
this.setState({settings: settings.getAll()});
},
render: function () {
- return (
- React.DOM.div({id: "container"},
- Header({settings: this.state.settings}),
- React.DOM.div({id: "main"},
- this.props.activeRouteHandler({settings: this.state.settings})
- ),
- Footer(null)
- )
- );
+ return (
+ React.DOM.div({id: "container"},
+ Header({settings: this.state.settings}),
+ React.DOM.div({id: "main"},
+ this.props.activeRouteHandler({settings: this.state.settings})
+ ),
+ Footer(null)
+ )
+ );
}
});
@@ -231,20 +231,18 @@ var TrafficTable = React.createClass({displayName: 'TrafficTable',
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){