aboutsummaryrefslogtreecommitdiffstats
path: root/libmproxy/web/static/app.js
diff options
context:
space:
mode:
authorvzvu3k6k <vzvu3k6k@gmail.com>2015-03-27 04:18:02 +0900
committervzvu3k6k <vzvu3k6k@gmail.com>2015-03-27 04:32:38 +0900
commitd65a4b610007c0ca60fa3f9ac9df06e74d6beb99 (patch)
tree7b4097cd9f62e38dedf347d66eec1bced16a721e /libmproxy/web/static/app.js
parent04f2467e84905d44483469cf43ada4ec44faa203 (diff)
downloadmitmproxy-d65a4b610007c0ca60fa3f9ac9df06e74d6beb99.tar.gz
mitmproxy-d65a4b610007c0ca60fa3f9ac9df06e74d6beb99.tar.bz2
mitmproxy-d65a4b610007c0ca60fa3f9ac9df06e74d6beb99.zip
web: upgrade to react-router 0.13.2
Diffstat (limited to 'libmproxy/web/static/app.js')
-rw-r--r--libmproxy/web/static/app.js5
1 files changed, 1 insertions, 4 deletions
diff --git a/libmproxy/web/static/app.js b/libmproxy/web/static/app.js
index e972e298..1528d382 100644
--- a/libmproxy/web/static/app.js
+++ b/libmproxy/web/static/app.js
@@ -506,7 +506,6 @@ var Navigation = _.extend({}, ReactRouter.Navigation, {
q[i] = dict[i] || undefined; //falsey values shall be removed.
}
}
- q._ = "_"; // workaround for https://github.com/rackt/react-router/pull/957
this.replaceWith(this.context.router.getCurrentPath(), this.context.router.getCurrentParams(), q);
},
replaceWith: function(routeNameOrPath, params, query) {
@@ -520,8 +519,6 @@ var Navigation = _.extend({}, ReactRouter.Navigation, {
query = this.context.router.getCurrentQuery();
}
- // FIXME: react-router is just broken,
- // we hopefully just need to wait for the next release with https://github.com/rackt/react-router/pull/957.
this.context.router.replaceWith(routeNameOrPath, params, query);
}
});
@@ -676,7 +673,7 @@ var LogMessage = React.createClass({displayName: "LogMessage",
}
return (
React.createElement("div", null,
- indicator, " ", entry.message
+ indicator, " ", entry.message
)
);
},