ignore compiled files in diff
This commit is contained in:
parent
674bc4273e
commit
6bac1540bd
|
@ -0,0 +1 @@
|
|||
libmproxy/web/static/**/* -diff
|
|
@ -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})
|
||||
)
|
||||
);
|
||||
}
|
||||
|
|
|
@ -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>
|
||||
);
|
||||
}
|
||||
|
|
|
@ -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>
|
||||
);
|
||||
}
|
||||
|
|
|
@ -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() {
|
||||
|
|
Loading…
Reference in New Issue