diff options
-rw-r--r-- | mitmproxy/web/static/app.css | 3 | ||||
-rw-r--r-- | mitmproxy/web/static/app.js | 5 | ||||
-rw-r--r-- | release/specs/icon.ico | bin | 0 -> 365133 bytes | |||
-rw-r--r-- | web/src/css/footer.less | 4 | ||||
-rw-r--r-- | web/src/js/components/eventlog.js | 5 |
5 files changed, 13 insertions, 4 deletions
diff --git a/mitmproxy/web/static/app.css b/mitmproxy/web/static/app.css index e6891e44..90b177c2 100644 --- a/mitmproxy/web/static/app.css +++ b/mitmproxy/web/static/app.css @@ -419,5 +419,8 @@ footer { box-shadow: 0 -1px 3px lightgray; padding: 0px 10px 3px; } +footer .label { + margin-right: 3px; +} /*# sourceMappingURL=app.css.map */ diff --git a/mitmproxy/web/static/app.js b/mitmproxy/web/static/app.js index 92eb60a1..5dd2359b 100644 --- a/mitmproxy/web/static/app.js +++ b/mitmproxy/web/static/app.js @@ -996,8 +996,9 @@ var EventLogContents = _react2.default.createClass({ }, componentWillReceiveProps: function componentWillReceiveProps(nextProps) { if (nextProps.filter !== this.props.filter) { - this.props.filter = nextProps.filter; // Dirty: Make sure that view filter sees the update. - this.state.view.recalculate(); + this.state.view.recalculate(function (entry) { + return nextProps.filter[entry.level]; + }); } }, getDefaultProps: function getDefaultProps() { diff --git a/release/specs/icon.ico b/release/specs/icon.ico Binary files differnew file mode 100644 index 00000000..bfd2fde7 --- /dev/null +++ b/release/specs/icon.ico diff --git a/web/src/css/footer.less b/web/src/css/footer.less index c041a022..34691207 100644 --- a/web/src/css/footer.less +++ b/web/src/css/footer.less @@ -1,4 +1,8 @@ footer { box-shadow: 0 -1px 3px lightgray; padding: 0px 10px 3px; + + .label { + margin-right: 3px; + } }
\ No newline at end of file diff --git a/web/src/js/components/eventlog.js b/web/src/js/components/eventlog.js index 650f7cd3..51f1578e 100644 --- a/web/src/js/components/eventlog.js +++ b/web/src/js/components/eventlog.js @@ -58,8 +58,9 @@ var EventLogContents = React.createClass({ }, componentWillReceiveProps: function (nextProps) { if (nextProps.filter !== this.props.filter) { - this.props.filter = nextProps.filter; // Dirty: Make sure that view filter sees the update. - this.state.view.recalculate(); + this.state.view.recalculate(entry => + nextProps.filter[entry.level] + ); } }, getDefaultProps: function () { |