aboutsummaryrefslogtreecommitdiffstats
path: root/web/src/js/components
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2014-09-16 01:05:29 +0200
committerMaximilian Hils <git@maximilianhils.com>2014-09-16 01:05:29 +0200
commit6bac1540bd9383c4e6e0510d9b75db34346187ed (patch)
tree636177a6bfc4a55ceb425b442fed2520aafb3145 /web/src/js/components
parent674bc4273e9a2f1a2e41ef977a80219423c7cb51 (diff)
downloadmitmproxy-6bac1540bd9383c4e6e0510d9b75db34346187ed.tar.gz
mitmproxy-6bac1540bd9383c4e6e0510d9b75db34346187ed.tar.bz2
mitmproxy-6bac1540bd9383c4e6e0510d9b75db34346187ed.zip
ignore compiled files in diff
Diffstat (limited to 'web/src/js/components')
-rw-r--r--web/src/js/components/Footer.react.js3
-rw-r--r--web/src/js/components/ProxyApp.react.js3
2 files changed, 3 insertions, 3 deletions
diff --git a/web/src/js/components/Footer.react.js b/web/src/js/components/Footer.react.js
index ae0ccbe5..20a4abfb 100644
--- a/web/src/js/components/Footer.react.js
+++ b/web/src/js/components/Footer.react.js
@@ -2,9 +2,10 @@
var Footer = React.createClass({
render(){
+ var mode = this.props.settings.mode;
return (
<footer>
- <span className="label label-success">transparent mode</span>
+ {mode != "regular" ? <span className="label label-success">{mode} mode</span> : null}
</footer>
);
}
diff --git a/web/src/js/components/ProxyApp.react.js b/web/src/js/components/ProxyApp.react.js
index 01adb089..07d66440 100644
--- a/web/src/js/components/ProxyApp.react.js
+++ b/web/src/js/components/ProxyApp.react.js
@@ -8,7 +8,6 @@ var Reports = React.createClass({
});
-
var ProxyAppMain = React.createClass({
getInitialState(){
return { settings: SettingsStore.getAll() };
@@ -29,7 +28,7 @@ var ProxyAppMain = React.createClass({
<Header settings={this.state.settings}/>
<div id="main"><this.props.activeRouteHandler/></div>
{this.state.settings.showEventLog ? <EventLog/> : null}
- <Footer/>
+ <Footer settings={this.state.settings}/>
</div>
);
}