diff options
author | Maximilian Hils <git@maximilianhils.com> | 2014-09-16 01:05:29 +0200 |
---|---|---|
committer | Maximilian Hils <git@maximilianhils.com> | 2014-09-16 01:05:29 +0200 |
commit | 6bac1540bd9383c4e6e0510d9b75db34346187ed (patch) | |
tree | 636177a6bfc4a55ceb425b442fed2520aafb3145 /web | |
parent | 674bc4273e9a2f1a2e41ef977a80219423c7cb51 (diff) | |
download | mitmproxy-6bac1540bd9383c4e6e0510d9b75db34346187ed.tar.gz mitmproxy-6bac1540bd9383c4e6e0510d9b75db34346187ed.tar.bz2 mitmproxy-6bac1540bd9383c4e6e0510d9b75db34346187ed.zip |
ignore compiled files in diff
Diffstat (limited to 'web')
-rw-r--r-- | web/src/js/components/Footer.react.js | 3 | ||||
-rw-r--r-- | web/src/js/components/ProxyApp.react.js | 3 | ||||
-rw-r--r-- | web/src/js/stores/SettingsStore.es6.js | 3 |
3 files changed, 5 insertions, 4 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> ); } diff --git a/web/src/js/stores/SettingsStore.es6.js b/web/src/js/stores/SettingsStore.es6.js index 2743161e..29971fa7 100644 --- a/web/src/js/stores/SettingsStore.es6.js +++ b/web/src/js/stores/SettingsStore.es6.js @@ -5,7 +5,8 @@ class _SettingsStore extends EventEmitter { //FIXME: What do we do if we haven't requested anything from the server yet? this.settings = { version: "0.12", - showEventLog: true + showEventLog: true, + mode: "transparent", }; } getAll() { |