aboutsummaryrefslogtreecommitdiffstats
path: root/web/src/js
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2015-10-08 12:43:55 +0200
committerMaximilian Hils <git@maximilianhils.com>2015-10-08 12:43:55 +0200
commit7d8191ee37a4e085d23217f85e41f4da4c9e4069 (patch)
treedc7642c64a2c65b65bf8a995e12e918b0c97c607 /web/src/js
parent442f079e0b4e715897318f378f8a08d7f2271990 (diff)
downloadmitmproxy-7d8191ee37a4e085d23217f85e41f4da4c9e4069.tar.gz
mitmproxy-7d8191ee37a4e085d23217f85e41f4da4c9e4069.tar.bz2
mitmproxy-7d8191ee37a4e085d23217f85e41f4da4c9e4069.zip
update web builds, use watchify
Diffstat (limited to 'web/src/js')
-rw-r--r--web/src/js/components/eventlog.js1
-rw-r--r--web/src/js/filt/filt.js2
2 files changed, 2 insertions, 1 deletions
diff --git a/web/src/js/components/eventlog.js b/web/src/js/components/eventlog.js
index 4c6dafb1..fea7b247 100644
--- a/web/src/js/components/eventlog.js
+++ b/web/src/js/components/eventlog.js
@@ -108,6 +108,7 @@ var ToggleFilter = React.createClass({
});
var EventLog = React.createClass({
+ mixins: [common.Navigation],
getInitialState: function () {
return {
filter: {
diff --git a/web/src/js/filt/filt.js b/web/src/js/filt/filt.js
index 02a04c66..45b42f3a 100644
--- a/web/src/js/filt/filt.js
+++ b/web/src/js/filt/filt.js
@@ -1771,4 +1771,4 @@ module.exports = (function() {
SyntaxError: SyntaxError,
parse: parse
};
-})();
+})(); \ No newline at end of file