Skip to content

Commit a3f488c

Browse files
committed
release v0.10.1
1 parent 9abea58 commit a3f488c

File tree

5 files changed

+30
-27
lines changed

5 files changed

+30
-27
lines changed

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
v0.10.1 - Fri, 31 Oct 2014 15:46:20 GMT
2+
---------------------------------------
3+
4+
- [70b442a](../../commit/70b442a) [added] React 0.12 compatibility
5+
6+
17
v0.10.0 - Thu, 30 Oct 2014 05:09:44 GMT
28
---------------------------------------
39

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "react-router",
3-
"version": "0.10.0",
3+
"version": "0.10.1",
44
"homepage": "https://github.com/rackt/react-router",
55
"authors": [
66
"Ryan Florence",

dist/react-router.js

Lines changed: 18 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1463,11 +1463,12 @@ function processRoute(route, container, namedRoutes) {
14631463
// Note: parentRoute may be a <Route> _or_ a <Routes>.
14641464
var props = route.props;
14651465

1466-
invariant(
1467-
React.isValidClass(props.handler),
1468-
'The handler for the "%s" route must be a valid React class',
1469-
props.name || props.path
1470-
);
1466+
// TODO: use isValidElement when we update everything for React 0.12
1467+
//invariant(
1468+
//React.isValidClass(props.handler),
1469+
//'The handler for the "%s" route must be a valid React class',
1470+
//props.name || props.path
1471+
//);
14711472

14721473
var parentPath = (container && container.props.path) || '/';
14731474

@@ -2154,25 +2155,21 @@ function Transition(routesComponent, path) {
21542155
this.isAborted = false;
21552156
}
21562157

2157-
Transition.prototype = {
2158-
2159-
abort: function (reason) {
2160-
this.abortReason = reason;
2161-
this.isAborted = true;
2162-
},
2163-
2164-
redirect: function (to, params, query) {
2165-
this.abort(new Redirect(to, params, query));
2166-
},
2158+
Transition.prototype.abort = function (reason) {
2159+
this.abortReason = reason;
2160+
this.isAborted = true;
2161+
};
21672162

2168-
wait: function (value) {
2169-
this.promise = Promise.resolve(value);
2170-
},
2163+
Transition.prototype.redirect = function (to, params, query) {
2164+
this.abort(new Redirect(to, params, query));
2165+
};
21712166

2172-
retry: function () {
2173-
this.routesComponent.replaceWith(this.path);
2174-
}
2167+
Transition.prototype.wait = function (value) {
2168+
this.promise = Promise.resolve(value);
2169+
};
21752170

2171+
Transition.prototype.retry = function () {
2172+
this.routesComponent.replaceWith(this.path);
21762173
};
21772174

21782175
module.exports = Transition;

dist/react-router.min.js

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "react-router",
3-
"version": "0.10.0",
3+
"version": "0.10.1",
44
"description": "A complete routing library for React.js",
55
"main": "./modules/index",
66
"repository": {

0 commit comments

Comments
 (0)