diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2015-03-30 11:54:14 +1300 |
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2015-03-30 11:54:14 +1300 |
| commit | ad08b80c432dc32eafa373abb19376203a156053 (patch) | |
| tree | 71e26b179e356e45e859715c1749e2e82a50f342 /web/src/js/components/mainview.js | |
| parent | e964983e8137ac7ae77a473dbb308ac910c72ca6 (diff) | |
| parent | 737002921e9aed701afb49fda8777e8c9286bf09 (diff) | |
| download | mitmproxy-ad08b80c432dc32eafa373abb19376203a156053.tar.gz mitmproxy-ad08b80c432dc32eafa373abb19376203a156053.tar.bz2 mitmproxy-ad08b80c432dc32eafa373abb19376203a156053.zip | |
Merge branch 'master' of ssh.github.com:mitmproxy/mitmproxy
Diffstat (limited to 'web/src/js/components/mainview.js')
| -rw-r--r-- | web/src/js/components/mainview.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/web/src/js/components/mainview.js b/web/src/js/components/mainview.js index 8f6989ae..2b7819c5 100644 --- a/web/src/js/components/mainview.js +++ b/web/src/js/components/mainview.js @@ -41,7 +41,7 @@ var MainView = React.createClass({ }, getViewFilt: function () { try { - var filt = Filt.parse(this.getQuery()[Query.FILTER] || ""); + var filt = Filt.parse(this.getQuery()[Query.SEARCH] || ""); var highlightStr = this.getQuery()[Query.HIGHLIGHT]; var highlight = highlightStr ? Filt.parse(highlightStr) : false; } catch (e) { @@ -57,7 +57,7 @@ var MainView = React.createClass({ }; }, componentWillReceiveProps: function (nextProps) { - var filterChanged = (this.props.query[Query.FILTER] !== nextProps.query[Query.FILTER]); + var filterChanged = (this.props.query[Query.SEARCH] !== nextProps.query[Query.SEARCH]); var highlightChanged = (this.props.query[Query.HIGHLIGHT] !== nextProps.query[Query.HIGHLIGHT]); if (filterChanged || highlightChanged) { this.state.view.recalculate(this.getViewFilt(), this.state.sortKeyFun); |