diff options
author | Chocobozzz <me@florianbigard.com> | 2018-04-17 15:11:12 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2018-04-17 15:11:12 +0200 |
commit | 66dc59076413b9a4aa0899d3192b0bdf03ee654d (patch) | |
tree | 7743a66a4d7a9fb1dba1d4d744c059dcd35c9224 /client/src/app | |
parent | 4195cd2bc5046d4cdf1c677c27cd41f427d7a13a (diff) | |
download | PeerTube-66dc59076413b9a4aa0899d3192b0bdf03ee654d.tar.gz PeerTube-66dc59076413b9a4aa0899d3192b0bdf03ee654d.tar.zst PeerTube-66dc59076413b9a4aa0899d3192b0bdf03ee654d.zip |
Add ability to click on the account in watch page
Diffstat (limited to 'client/src/app')
4 files changed, 17 insertions, 7 deletions
diff --git a/client/src/app/header/header.component.ts b/client/src/app/header/header.component.ts index 6b0ee67ff..42de2dd92 100644 --- a/client/src/app/header/header.component.ts +++ b/client/src/app/header/header.component.ts | |||
@@ -1,5 +1,5 @@ | |||
1 | import { Component, OnInit } from '@angular/core' | 1 | import { Component, OnInit } from '@angular/core' |
2 | import { Router } from '@angular/router' | 2 | import { Router, NavigationEnd } from '@angular/router' |
3 | import { getParameterByName } from '../shared/misc/utils' | 3 | import { getParameterByName } from '../shared/misc/utils' |
4 | 4 | ||
5 | @Component({ | 5 | @Component({ |
@@ -14,8 +14,11 @@ export class HeaderComponent implements OnInit { | |||
14 | constructor (private router: Router) {} | 14 | constructor (private router: Router) {} |
15 | 15 | ||
16 | ngOnInit () { | 16 | ngOnInit () { |
17 | const searchQuery = getParameterByName('search', window.location.href) | 17 | this.router.events |
18 | if (searchQuery) this.searchValue = searchQuery | 18 | .filter(e => e instanceof NavigationEnd) |
19 | .map(() => getParameterByName('search', window.location.href)) | ||
20 | .filter(searchQuery => !!searchQuery) | ||
21 | .subscribe(searchQuery => this.searchValue = searchQuery) | ||
19 | } | 22 | } |
20 | 23 | ||
21 | doSearch () { | 24 | doSearch () { |
diff --git a/client/src/app/videos/+video-watch/video-watch.component.html b/client/src/app/videos/+video-watch/video-watch.component.html index 52e3e429a..91e590094 100644 --- a/client/src/app/videos/+video-watch/video-watch.component.html +++ b/client/src/app/videos/+video-watch/video-watch.component.html | |||
@@ -22,8 +22,11 @@ | |||
22 | </div> | 22 | </div> |
23 | 23 | ||
24 | <div class="video-info-by"> | 24 | <div class="video-info-by"> |
25 | By {{ video.by }} | 25 | <a [routerLink]="[ '/videos', 'search' ]" [queryParams]="{ search: video.account.name }" title="Search videos of this account"> |
26 | <img [src]="getAvatarPath()" alt="Account avatar" /> | 26 | By {{ video.by }} |
27 | <img [src]="getAvatarPath()" alt="Account avatar" /> | ||
28 | </a> | ||
29 | |||
27 | <my-video-feed [syndicationItems]="syndicationItems"></my-video-feed> | 30 | <my-video-feed [syndicationItems]="syndicationItems"></my-video-feed> |
28 | </div> | 31 | </div> |
29 | </div> | 32 | </div> |
diff --git a/client/src/app/videos/+video-watch/video-watch.component.scss b/client/src/app/videos/+video-watch/video-watch.component.scss index 8a3e2584b..3ebeccd4b 100644 --- a/client/src/app/videos/+video-watch/video-watch.component.scss +++ b/client/src/app/videos/+video-watch/video-watch.component.scss | |||
@@ -73,6 +73,11 @@ | |||
73 | align-items: center; | 73 | align-items: center; |
74 | font-size: 13px; | 74 | font-size: 13px; |
75 | 75 | ||
76 | a { | ||
77 | color: black; | ||
78 | display: inline-block; | ||
79 | } | ||
80 | |||
76 | img { | 81 | img { |
77 | @include avatar(18px); | 82 | @include avatar(18px); |
78 | 83 | ||
diff --git a/client/src/app/videos/video-list/video-search.component.ts b/client/src/app/videos/video-list/video-search.component.ts index ef9afa757..46a9dd48e 100644 --- a/client/src/app/videos/video-list/video-search.component.ts +++ b/client/src/app/videos/video-list/video-search.component.ts | |||
@@ -7,7 +7,6 @@ import { Subscription } from 'rxjs/Subscription' | |||
7 | import { AuthService } from '../../core/auth' | 7 | import { AuthService } from '../../core/auth' |
8 | import { AbstractVideoList } from '../../shared/video/abstract-video-list' | 8 | import { AbstractVideoList } from '../../shared/video/abstract-video-list' |
9 | import { VideoService } from '../../shared/video/video.service' | 9 | import { VideoService } from '../../shared/video/video.service' |
10 | import { FeedFormat } from '../../../../../shared/models/feeds/feed-format.enum' | ||
11 | 10 | ||
12 | @Component({ | 11 | @Component({ |
13 | selector: 'my-videos-search', | 12 | selector: 'my-videos-search', |
@@ -64,6 +63,6 @@ export class VideoSearchComponent extends AbstractVideoList implements OnInit, O | |||
64 | } | 63 | } |
65 | 64 | ||
66 | generateSyndicationList () { | 65 | generateSyndicationList () { |
67 | throw new Error('Method not implemented.') | 66 | throw new Error('Search does not support syndication.') |
68 | } | 67 | } |
69 | } | 68 | } |