Merge remote-tracking branch 'legend/master'

Conflicts:
	libmproxy/web/static/app.js

1 files changed, 12 insertions, 3 deletions

diff --git a/web/src/js/components/flowtable.js b/web/src/js/components/flowtable.js
index d4515257..cd50b891 100644
--- a/web/src/js/components/flowtable.js
+++ b/web/src/js/components/flowtable.js
@@ -65,15 +65,24 @@ var FlowTable = React.createClass({
     },
     componentWillMount: function () {
         if (this.props.view) {
-            this.props.view.addListener("add update remove recalculate", this.onChange);
+            this.props.view.addListener("add", this.onChange);
+            this.props.view.addListener("update", this.onChange);
+            this.props.view.addListener("remove", this.onChange);
+            this.props.view.addListener("recalculate", this.onChange);
         }
     },
     componentWillReceiveProps: function (nextProps) {
         if (nextProps.view !== this.props.view) {
             if (this.props.view) {
-                this.props.view.removeListener("add update remove recalculate");
+                this.props.view.removeListener("add");
+                this.props.view.removeListener("update");
+                this.props.view.removeListener("remove");
+                this.props.view.removeListener("recalculate");
             }
-            nextProps.view.addListener("add update remove recalculate", this.onChange);
+            nextProps.view.addListener("add", this.onChange);
+            nextProps.view.addListener("update", this.onChange);
+            nextProps.view.addListener("remove", this.onChange);
+            nextProps.view.addListener("recalculate", this.onChange);
         }
     },
     getDefaultProps: function () {