mirror of
https://github.com/Grasscutters/mitmproxy.git
synced 2025-01-30 23:09:44 +00:00
Merge remote-tracking branch 'vzvu/react-router-0.13.2'
Conflicts: libmproxy/web/static/vendor.js
This commit is contained in:
commit
11b082c998
@ -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);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
@ -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",
|
||||||
|
@ -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);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
Loading…
Reference in New Issue
Block a user