Merge remote-tracking branch 'legend/master'

Conflicts:
	libmproxy/web/static/app.js

3 files changed, 17 insertions, 5 deletions

diff --git a/web/src/js/components/eventlog.js b/web/src/js/components/eventlog.js
index 85c33527..ae7cd093 100644
--- a/web/src/js/components/eventlog.js
+++ b/web/src/js/components/eventlog.js
@@ -49,7 +49,8 @@ var EventLogContents = React.createClass({
             view: view
         });
 
-        view.addListener("add recalculate", this.onEventLogChange);
+        view.addListener("add", this.onEventLogChange);
+        view.addListener("recalculate", this.onEventLogChange);
     },
     closeView: function () {
         this.state.view.close();
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 () {
diff --git a/web/src/js/components/mainview.js b/web/src/js/components/mainview.js
index 6c91529d..550a61da 100644
--- a/web/src/js/components/mainview.js
+++ b/web/src/js/components/mainview.js
@@ -54,7 +54,9 @@ var MainView = React.createClass({
         });
 
         view.addListener("recalculate", this.onRecalculate);
-        view.addListener("add update remove", this.onUpdate);
+        view.addListener("add", this.onUpdate);
+        view.addListener("update", this.onUpdate);
+        view.addListener("remove", this.onUpdate);
         view.addListener("remove", this.onRemove);
     },
     onRecalculate: function () {