Merge pull request #157 from adrienbrault/patch-1

Pavlo Aksonov · Pavlo Aksonov · commit 5d9d3bd1ecad · 2016-01-30T09:42:31.000+01:00
Support passing type to Actions.route, fixes #155
diff --git a/Router.js b/Router.js
@@ -145,7 +145,8 @@ export default class Router {
         if (!this.routes[name]){
             throw new Error("No route is defined for name="+name);
         }
-        const action = this.routes[name].type === "switch" ? "jump": this.routes[name].type;
+        const type = props.type ? props.type : this.routes[name].type;
+        const action = type === "switch" ? "jump": type;
         if (!action){
             throw new Error("No type is defined for name="+name);
         }

Original file line number	Diff line number	Diff line change
`@@ -145,7 +145,8 @@ export default class Router {`
`145`	`145`	`if (!this.routes[name]){`
`146`	`146`	`throw new Error("No route is defined for name="+name);`
`147`	`147`	`}`
`148`		`- const action = this.routes[name].type === "switch" ? "jump": this.routes[name].type;`
	`148`	`+ const type = props.type ? props.type : this.routes[name].type;`
	`149`	`+ const action = type === "switch" ? "jump": type;`
`149`	`150`	`if (!action){`
`150`	`151`	`throw new Error("No type is defined for name="+name);`
`151`	`152`	`}`