Grasscutters/mitmproxy
3
0
Fork 0
mirror of https://github.com/Grasscutters/mitmproxy.git synced 2025-01-30 14:58:38 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'vzvu/react-router-0.13.2'

Browse Source 
Conflicts:
	libmproxy/web/static/vendor.js
This commit is contained in:
Maximilian Hils 2015-03-27 16:17:35 +01:00
commit 11b082c998
3 changed files with 1 additions and 7 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._ = "_"; // 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);
}
});

2
web/package.json
View File

@ -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",

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._ = "_"; // 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);
}
});