NextERP/owl
2
0
Fork 0
mirror of https://github.com/odoo/owl.git synced 2025-10-06 19:59:41 +07:00
Code Issues Packages Projects Releases Wiki Activity

[REF] router: add TestRouter and improve tests

Browse Source
This commit is contained in:
Géry Debongnie
2019-07-25 23:17:34 +02:00
parent bb46346767
commit bf705fcd99
4 changed files with 74 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/router/Router.ts
+8 -4
View File
@@ -60,7 +60,8 @@ export class Router {
this.checkRoute();
window.addEventListener("popstate", () => this.checkAndUpdateRoute());
this.checkAndUpdateRoute = this.checkAndUpdateRoute.bind(this);
window.addEventListener("popstate", this.checkAndUpdateRoute);
// setup link and directive
env.qweb.addTemplate(LINK_TEMPLATE_NAME, LINK_TEMPLATE);
@@ -74,11 +75,14 @@ export class Router {
}
destToUrl(dest: Destination): string {
if ((!dest.path && !dest.name) || (dest.path && dest.name)) {
throw new Error(`Invalid destination: ${JSON.stringify(dest)}`);
}
return dest.path || this.routeToURL(this.routes[dest.name!].path, dest.params!);
}
get currentRouteName(): string | null{
return this.currentRoute && this.currentRoute.name;
get currentRouteName(): string | null {
return this.currentRoute && this.currentRoute.name;
}
private routeToURL(path: string, params: RouteParams): string {
@@ -112,7 +116,7 @@ export class Router {
this.currentParams = {};
}
private checkAndUpdateRoute(): void {
protected checkAndUpdateRoute(): void {
const initialName = this.currentRoute ? this.currentRoute.name : null;
this.checkRoute();
const currentName = this.currentRoute ? this.currentRoute.name : null;