diff options
author | Chocobozzz <me@florianbigard.com> | 2018-06-08 11:25:12 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2018-06-08 11:25:12 +0200 |
commit | 7cf26f433f5d93fb5325495bc87bdef87260aada (patch) | |
tree | 675e45abf0d63f20e3b6da9293ed5a32e0d1b1a4 /client/src/app | |
parent | dbe868c07080135cf62ecb8ad556d471c1e6c2ca (diff) | |
download | PeerTube-7cf26f433f5d93fb5325495bc87bdef87260aada.tar.gz PeerTube-7cf26f433f5d93fb5325495bc87bdef87260aada.tar.zst PeerTube-7cf26f433f5d93fb5325495bc87bdef87260aada.zip |
Fix e2e tests
Diffstat (limited to 'client/src/app')
-rw-r--r-- | client/src/app/app.component.ts | 2 | ||||
-rw-r--r-- | client/src/app/core/routing/redirect.service.ts | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/client/src/app/app.component.ts b/client/src/app/app.component.ts index 6087dbf80..0bfe9f916 100644 --- a/client/src/app/app.component.ts +++ b/client/src/app/app.component.ts | |||
@@ -55,7 +55,7 @@ export class AppComponent implements OnInit { | |||
55 | if (e instanceof NavigationEnd) { | 55 | if (e instanceof NavigationEnd) { |
56 | const pathname = window.location.pathname | 56 | const pathname = window.location.pathname |
57 | if (!pathname || pathname === '/' || is18nPath(pathname)) { | 57 | if (!pathname || pathname === '/' || is18nPath(pathname)) { |
58 | this.redirectService.redirectToHomepage() | 58 | this.redirectService.redirectToHomepage(true) |
59 | } | 59 | } |
60 | } | 60 | } |
61 | }) | 61 | }) |
diff --git a/client/src/app/core/routing/redirect.service.ts b/client/src/app/core/routing/redirect.service.ts index b7803cce2..1881be117 100644 --- a/client/src/app/core/routing/redirect.service.ts +++ b/client/src/app/core/routing/redirect.service.ts | |||
@@ -28,10 +28,10 @@ export class RedirectService { | |||
28 | }) | 28 | }) |
29 | } | 29 | } |
30 | 30 | ||
31 | redirectToHomepage () { | 31 | redirectToHomepage (skipLocationChange = false) { |
32 | console.log('Redirecting to %s...', RedirectService.DEFAULT_ROUTE) | 32 | console.log('Redirecting to %s...', RedirectService.DEFAULT_ROUTE) |
33 | 33 | ||
34 | this.router.navigate([ RedirectService.DEFAULT_ROUTE ], { skipLocationChange: true }) | 34 | this.router.navigate([ RedirectService.DEFAULT_ROUTE ], { skipLocationChange }) |
35 | .catch(() => { | 35 | .catch(() => { |
36 | console.error( | 36 | console.error( |
37 | 'Cannot navigate to %s, resetting default route to %s.', | 37 | 'Cannot navigate to %s, resetting default route to %s.', |
@@ -40,7 +40,7 @@ export class RedirectService { | |||
40 | ) | 40 | ) |
41 | 41 | ||
42 | RedirectService.DEFAULT_ROUTE = RedirectService.INIT_DEFAULT_ROUTE | 42 | RedirectService.DEFAULT_ROUTE = RedirectService.INIT_DEFAULT_ROUTE |
43 | return this.router.navigate([ RedirectService.DEFAULT_ROUTE ], { skipLocationChange: true }) | 43 | return this.router.navigate([ RedirectService.DEFAULT_ROUTE ], { skipLocationChange }) |
44 | }) | 44 | }) |
45 | 45 | ||
46 | } | 46 | } |