Rooba
/
mitmproxy
mirror of https://github.com/mitmproxy/mitmproxy.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

web: upgrade to react-router 0.13.2

This commit is contained in:
vzvu3k6k 2015-03-27 04:18:02 +09:00
parent 04f2467e84
commit d65a4b6100
4 changed files with 1756 additions and 1432 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libmproxy/web/static/app.js
View File

@ -506,7 +506,6 @@ var Navigation = _.extend({}, ReactRouter.Navigation, {
q[i] = dict[i] || undefined; //falsey values shall be removed. 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); this.replaceWith(this.context.router.getCurrentPath(), this.context.router.getCurrentParams(), q);
}, },
replaceWith: function(routeNameOrPath, params, query) { replaceWith: function(routeNameOrPath, params, query) {
@ -520,8 +519,6 @@ var Navigation = _.extend({}, ReactRouter.Navigation, {
query = this.context.router.getCurrentQuery(); 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); this.context.router.replaceWith(routeNameOrPath, params, query);
} }
}); });

3160
libmproxy/web/static/vendor.js
View File

File diff suppressed because it is too large Load Diff

2
web/package.json
View File

@ -20,7 +20,7 @@
"jquery": "", "jquery": "",
"lodash": "", "lodash": "",
"react": "^0.13.1", "react": "^0.13.1",
"react-router": "^0.13.1" "react-router": "^0.13.2"
}, },
"devDependencies": { "devDependencies": {
"browserify": "=8.0.1", "browserify": "=8.0.1",

3
web/src/js/components/common.js
View File

@ -45,7 +45,6 @@ var Navigation = _.extend({}, ReactRouter.Navigation, {
q[i] = dict[i] || undefined; //falsey values shall be removed. 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); this.replaceWith(this.context.router.getCurrentPath(), this.context.router.getCurrentParams(), q);
}, },
replaceWith: function(routeNameOrPath, params, query) { replaceWith: function(routeNameOrPath, params, query) {
@ -59,8 +58,6 @@ var Navigation = _.extend({}, ReactRouter.Navigation, {
query = this.context.router.getCurrentQuery(); 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); this.context.router.replaceWith(routeNameOrPath, params, query);
} }
}); });