diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2015-03-27 16:17:35 +0100 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2015-03-27 16:17:35 +0100 |
| commit | 11b082c99810e5fb2cce78c99a850b0aa8558609 (patch) | |
| tree | c44b7e2b392788ca8e8c46b18d50ce982f18cb19 | |
| parent | 42cd942b64e53db9feb5f6c8b2a95669e97b1230 (diff) | |
| parent | d65a4b610007c0ca60fa3f9ac9df06e74d6beb99 (diff) | |
| download | mitmproxy-11b082c99810e5fb2cce78c99a850b0aa8558609.tar.gz mitmproxy-11b082c99810e5fb2cce78c99a850b0aa8558609.tar.bz2 mitmproxy-11b082c99810e5fb2cce78c99a850b0aa8558609.zip | |
Merge remote-tracking branch 'vzvu/react-router-0.13.2'
Conflicts:
libmproxy/web/static/vendor.js
| -rw-r--r-- | libmproxy/web/static/app.js | 3 | ||||
| -rw-r--r-- | web/package.json | 2 | ||||
| -rw-r--r-- | web/src/js/components/common.js | 3 |
3 files changed, 1 insertions, 7 deletions
diff --git a/libmproxy/web/static/app.js b/libmproxy/web/static/app.js index efd2bf95..044b9e35 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); } }); diff --git a/web/package.json b/web/package.json index 5b15f695..e55081a3 100644 --- a/web/package.json +++ b/web/package.json @@ -20,7 +20,7 @@ "jquery": "", "lodash": "", "react": "^0.13.1", - "react-router": "^0.13.1" + "react-router": "^0.13.2" }, "devDependencies": { "browserify": "=8.0.1", diff --git a/web/src/js/components/common.js b/web/src/js/components/common.js index 956a46d2..ba4c93c2 100644 --- a/web/src/js/components/common.js +++ b/web/src/js/components/common.js @@ -45,7 +45,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) { @@ -59,8 +58,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); } }); |