diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 000000000..569c27415
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+libmproxy/web/static/**/* -diff
\ No newline at end of file
diff --git a/libmproxy/web/static/js/app.js b/libmproxy/web/static/js/app.js
index 8c8986733..dbaa5cb4b 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})
)
);
}
diff --git a/web/src/js/components/Footer.react.js b/web/src/js/components/Footer.react.js
index ae0ccbe59..20a4abfbf 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 (
);
}
diff --git a/web/src/js/components/ProxyApp.react.js b/web/src/js/components/ProxyApp.react.js
index 01adb089e..07d664404 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({
{this.state.settings.showEventLog ? : null}
-
+