aboutsummaryrefslogtreecommitdiffhomepage
path: root/client/src/app/+videos/+video-watch
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2021-05-28 11:36:33 +0200
committerChocobozzz <me@florianbigard.com>2021-05-28 11:38:08 +0200
commita1eda903a497857017495f37a1fd3593ba7ab23c (patch)
treea109f34af8b18c087caf6d5a7264267550f0416d /client/src/app/+videos/+video-watch
parent012580d98f489e599d44a9a2a0bdc892b9455a90 (diff)
downloadPeerTube-a1eda903a497857017495f37a1fd3593ba7ab23c.tar.gz
PeerTube-a1eda903a497857017495f37a1fd3593ba7ab23c.tar.zst
PeerTube-a1eda903a497857017495f37a1fd3593ba7ab23c.zip
Support '/w/' and '/w/p/' for watch page
And use them as default in client
Diffstat (limited to 'client/src/app/+videos/+video-watch')
-rw-r--r--client/src/app/+videos/+video-watch/comment/video-comment.component.html4
-rw-r--r--client/src/app/+videos/+video-watch/video-watch-routing.module.ts2
-rw-r--r--client/src/app/+videos/+video-watch/video-watch.component.ts2
3 files changed, 4 insertions, 4 deletions
diff --git a/client/src/app/+videos/+video-watch/comment/video-comment.component.html b/client/src/app/+videos/+video-watch/comment/video-comment.component.html
index fc0d66ffd..06548edc8 100644
--- a/client/src/app/+videos/+video-watch/comment/video-comment.component.html
+++ b/client/src/app/+videos/+video-watch/comment/video-comment.component.html
@@ -20,7 +20,7 @@
20 </a> 20 </a>
21 </div> 21 </div>
22 22
23 <a [routerLink]="['/videos/watch', video.uuid, { 'threadId': comment.threadId }]" class="comment-date" [title]="comment.createdAt"> 23 <a [routerLink]="['/w', video.uuid, { 'threadId': comment.threadId }]" class="comment-date" [title]="comment.createdAt">
24 {{ comment.createdAt | myFromNow }} 24 {{ comment.createdAt | myFromNow }}
25 </a> 25 </a>
26 </div> 26 </div>
@@ -45,7 +45,7 @@
45 <ng-container *ngIf="comment.isDeleted"> 45 <ng-container *ngIf="comment.isDeleted">
46 <div class="comment-account-date"> 46 <div class="comment-account-date">
47 <span class="comment-account" i18n>Deleted</span> 47 <span class="comment-account" i18n>Deleted</span>
48 <a [routerLink]="['/videos/watch', video.uuid, { 'threadId': comment.threadId }]" 48 <a [routerLink]="['/w', video.uuid, { 'threadId': comment.threadId }]"
49 class="comment-date">{{ comment.createdAt | myFromNow }}</a> 49 class="comment-date">{{ comment.createdAt | myFromNow }}</a>
50 </div> 50 </div>
51 51
diff --git a/client/src/app/+videos/+video-watch/video-watch-routing.module.ts b/client/src/app/+videos/+video-watch/video-watch-routing.module.ts
index cb77685c0..657fd10f8 100644
--- a/client/src/app/+videos/+video-watch/video-watch-routing.module.ts
+++ b/client/src/app/+videos/+video-watch/video-watch-routing.module.ts
@@ -4,7 +4,7 @@ import { VideoWatchComponent } from './video-watch.component'
4 4
5const videoWatchRoutes: Routes = [ 5const videoWatchRoutes: Routes = [
6 { 6 {
7 path: 'playlist/:playlistId', 7 path: 'p/:playlistId',
8 component: VideoWatchComponent 8 component: VideoWatchComponent
9 }, 9 },
10 { 10 {
diff --git a/client/src/app/+videos/+video-watch/video-watch.component.ts b/client/src/app/+videos/+video-watch/video-watch.component.ts
index 88c5cef52..0acd44524 100644
--- a/client/src/app/+videos/+video-watch/video-watch.component.ts
+++ b/client/src/app/+videos/+video-watch/video-watch.component.ts
@@ -690,7 +690,7 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
690 if (this.playlist) { 690 if (this.playlist) {
691 this.zone.run(() => this.videoWatchPlaylist.navigateToNextPlaylistVideo()) 691 this.zone.run(() => this.videoWatchPlaylist.navigateToNextPlaylistVideo())
692 } else if (this.nextVideoUuid) { 692 } else if (this.nextVideoUuid) {
693 this.router.navigate([ '/videos/watch', this.nextVideoUuid ]) 693 this.router.navigate([ '/w', this.nextVideoUuid ])
694 } 694 }
695 } 695 }
696 696