aboutsummaryrefslogtreecommitdiffstats
path: root/libmproxy/web/static
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 /libmproxy/web/static
parent674bc4273e9a2f1a2e41ef977a80219423c7cb51 (diff)
downloadmitmproxy-6bac1540bd9383c4e6e0510d9b75db34346187ed.tar.gz
mitmproxy-6bac1540bd9383c4e6e0510d9b75db34346187ed.tar.bz2
mitmproxy-6bac1540bd9383c4e6e0510d9b75db34346187ed.zip
ignore compiled files in diff
Diffstat (limited to 'libmproxy/web/static')
-rw-r--r--libmproxy/web/static/js/app.js9
1 files changed, 5 insertions, 4 deletions
diff --git a/libmproxy/web/static/js/app.js b/libmproxy/web/static/js/app.js
index 8c898673..dbaa5cb4 100644
--- a/libmproxy/web/static/js/app.js
+++ b/libmproxy/web/static/js/app.js
@@ -83,7 +83,8 @@ for(var EventEmitter____Key in EventEmitter){if(EventEmitter.hasOwnProperty(Even
//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",
};
}
_SettingsStore.prototype.getAll=function() {"use strict";
@@ -385,9 +386,10 @@ var EventLog = React.createClass({displayName: 'EventLog',
var Footer = React.createClass({displayName: 'Footer',
render:function(){
+ var mode = this.props.settings.mode;
return (
React.DOM.footer(null,
- React.DOM.span({className: "label label-success"}, "transparent mode")
+ mode != "regular" ? React.DOM.span({className: "label label-success"}, mode, " mode") : null
)
);
}
@@ -402,7 +404,6 @@ var Reports = React.createClass({displayName: 'Reports',
});
-
var ProxyAppMain = React.createClass({displayName: 'ProxyAppMain',
getInitialState:function(){
return { settings: SettingsStore.getAll() };
@@ -423,7 +424,7 @@ var ProxyAppMain = React.createClass({displayName: 'ProxyAppMain',
Header({settings: this.state.settings}),
React.DOM.div({id: "main"}, this.props.activeRouteHandler(null)),
this.state.settings.showEventLog ? EventLog(null) : null,
- Footer(null)
+ Footer({settings: this.state.settings})
)
);
}