aboutsummaryrefslogtreecommitdiffstats
path: root/web/src/js/components
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2014-12-12 19:33:06 +0100
committerMaximilian Hils <git@maximilianhils.com>2014-12-12 19:33:06 +0100
commit588d6dbe22630333a4da6b4cb92158c25c4b858e (patch)
treed4cb2fec260fab89711ad43838cba8be170f03bf /web/src/js/components
parent5ccae48b92b093d68c8df8e557624cfb29d9c2fa (diff)
downloadmitmproxy-588d6dbe22630333a4da6b4cb92158c25c4b858e.tar.gz
mitmproxy-588d6dbe22630333a4da6b4cb92158c25c4b858e.tar.bz2
mitmproxy-588d6dbe22630333a4da6b4cb92158c25c4b858e.zip
web: filtering
Diffstat (limited to 'web/src/js/components')
-rw-r--r--web/src/js/components/eventlog.jsx.js2
-rw-r--r--web/src/js/components/mainview.jsx.js10
2 files changed, 10 insertions, 2 deletions
diff --git a/web/src/js/components/eventlog.jsx.js b/web/src/js/components/eventlog.jsx.js
index 7ef369f8..9632eeec 100644
--- a/web/src/js/components/eventlog.jsx.js
+++ b/web/src/js/components/eventlog.jsx.js
@@ -57,7 +57,7 @@ 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.props.eventStore.list);
+ this.state.view.recalculate();
}
if (nextProps.eventStore !== this.props.eventStore) {
this.closeView();
diff --git a/web/src/js/components/mainview.jsx.js b/web/src/js/components/mainview.jsx.js
index 6e216b6a..acafdf34 100644
--- a/web/src/js/components/mainview.jsx.js
+++ b/web/src/js/components/mainview.jsx.js
@@ -1,10 +1,18 @@
var MainView = React.createClass({
mixins: [Navigation, State],
getInitialState: function () {
+ this.onQueryChange(Query.FILTER, function(){
+ this.state.view.recalculate(this.getViewFilt(), this.getViewSort());
+ }.bind(this));
return {
flows: []
};
},
+ getViewFilt: function(){
+ return Filt.parse(this.getQuery()[Query.FILTER]);
+ },
+ getViewSort: function(){
+ },
componentWillReceiveProps: function (nextProps) {
if (nextProps.flowStore !== this.props.flowStore) {
this.closeView();
@@ -12,7 +20,7 @@ var MainView = React.createClass({
}
},
openView: function (store) {
- var view = new StoreView(store);
+ var view = new StoreView(store, this.getViewFilt(), this.getViewSort());
this.setState({
view: view
});