diff options
author | Maximilian Hils <git@maximilianhils.com> | 2014-12-23 01:26:03 +0100 |
---|---|---|
committer | Maximilian Hils <git@maximilianhils.com> | 2014-12-23 01:26:03 +0100 |
commit | 459772a8ef79ac0adeaeba56577972e86074265e (patch) | |
tree | 89d6af5cbe8553d12a5263fc82ab5b44d12a2a4a /web/src/js/components/mainview.jsx.js | |
parent | b55d584309ed6fde064c3f251e4d21e2ab754acd (diff) | |
download | mitmproxy-459772a8ef79ac0adeaeba56577972e86074265e.tar.gz mitmproxy-459772a8ef79ac0adeaeba56577972e86074265e.tar.bz2 mitmproxy-459772a8ef79ac0adeaeba56577972e86074265e.zip |
web: squash bugs
Diffstat (limited to 'web/src/js/components/mainview.jsx.js')
-rw-r--r-- | web/src/js/components/mainview.jsx.js | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/web/src/js/components/mainview.jsx.js b/web/src/js/components/mainview.jsx.js index be20a357..113b0896 100644 --- a/web/src/js/components/mainview.jsx.js +++ b/web/src/js/components/mainview.jsx.js @@ -15,27 +15,18 @@ var MainView = React.createClass({ try { var filt = Filt.parse(this.getQuery()[Query.FILTER] || ""); var highlightStr = this.getQuery()[Query.HIGHLIGHT]; - var highlight = highlightStr ? [Filt.parse(highlightStr)] : []; + var highlight = highlightStr ? Filt.parse(highlightStr) : false; } catch(e){ console.error("Error when processing filter: " + e); } - var FadedHighlightColors = ["hsla(57, 100%, 50%, 0.33)"]; - return function filter_and_highlight(flow) { - var view = this.state.view; - if(!view._highlight){ - view._highlight = {}; - } - view._highlight[flow.id] = []; - - for (var i = 0; i < highlight.length; i++) { - if (highlight[i] && highlight[i](flow)) { - view._highlight[flow.id].push(FadedHighlightColors[i]); - } + if(!this._highlight){ + this._highlight = {}; } + this._highlight[flow.id] = highlight && highlight(flow); return filt(flow); - }.bind(this); + }; }, getViewSort: function () { }, |