diff options
Diffstat (limited to 'client')
5 files changed, 6 insertions, 8 deletions
diff --git a/client/src/app/account/account-videos/account-videos.component.html b/client/src/app/account/account-videos/account-videos.component.html index 94b976869..eb0a32fd3 100644 --- a/client/src/app/account/account-videos/account-videos.component.html +++ b/client/src/app/account/account-videos/account-videos.component.html | |||
@@ -8,7 +8,7 @@ | |||
8 | 8 | ||
9 | <div class="video-info"> | 9 | <div class="video-info"> |
10 | <div class="video-info-name">{{ video.name }}</div> | 10 | <div class="video-info-name">{{ video.name }}</div> |
11 | <span class="video-info-date-views">{{ video.createdAt | fromNow }} - {{ video.views | numberFormatter }} views</span> | 11 | <span class="video-info-date-views">{{ video.createdAt | myFromNow }} - {{ video.views | myNumberFormatter }} views</span> |
12 | </div> | 12 | </div> |
13 | 13 | ||
14 | <a class="edit-button" [routerLink]="[ '/videos', video.id, '/edit' ]"> | 14 | <a class="edit-button" [routerLink]="[ '/videos', video.id, '/edit' ]"> |
diff --git a/client/src/app/account/account-videos/account-videos.component.ts b/client/src/app/account/account-videos/account-videos.component.ts index ff945825d..cc28f511a 100644 --- a/client/src/app/account/account-videos/account-videos.component.ts +++ b/client/src/app/account/account-videos/account-videos.component.ts | |||
@@ -1,8 +1,7 @@ | |||
1 | import { Component, OnDestroy, OnInit } from '@angular/core' | 1 | import { Component, OnDestroy, OnInit } from '@angular/core' |
2 | import { AbstractVideoList } from '../../shared/video/abstract-video-list' | 2 | import { ActivatedRoute, Router } from '@angular/router' |
3 | import { ActivatedRoute } from '@angular/router' | ||
4 | import { Router } from '@angular/router' | ||
5 | import { NotificationsService } from 'angular2-notifications' | 3 | import { NotificationsService } from 'angular2-notifications' |
4 | import { AbstractVideoList } from '../../shared/video/abstract-video-list' | ||
6 | import { VideoService } from '../../shared/video/video.service' | 5 | import { VideoService } from '../../shared/video/video.service' |
7 | 6 | ||
8 | @Component({ | 7 | @Component({ |
diff --git a/client/src/app/shared/misc/from-now.pipe.ts b/client/src/app/shared/misc/from-now.pipe.ts index 80dab02ba..fac02af0b 100644 --- a/client/src/app/shared/misc/from-now.pipe.ts +++ b/client/src/app/shared/misc/from-now.pipe.ts | |||
@@ -1,8 +1,7 @@ | |||
1 | import { Pipe, PipeTransform } from '@angular/core' | 1 | import { Pipe, PipeTransform } from '@angular/core' |
2 | 2 | ||
3 | // Thanks: https://stackoverflow.com/questions/3177836/how-to-format-time-since-xxx-e-g-4-minutes-ago-similar-to-stack-exchange-site | 3 | // Thanks: https://stackoverflow.com/questions/3177836/how-to-format-time-since-xxx-e-g-4-minutes-ago-similar-to-stack-exchange-site |
4 | 4 | @Pipe({ name: 'myFromNow' }) | |
5 | @Pipe({name: 'fromNow'}) | ||
6 | export class FromNowPipe implements PipeTransform { | 5 | export class FromNowPipe implements PipeTransform { |
7 | 6 | ||
8 | transform (value: number) { | 7 | transform (value: number) { |
diff --git a/client/src/app/shared/misc/number-formatter.pipe.ts b/client/src/app/shared/misc/number-formatter.pipe.ts index 2491fb1d6..8a0756a36 100644 --- a/client/src/app/shared/misc/number-formatter.pipe.ts +++ b/client/src/app/shared/misc/number-formatter.pipe.ts | |||
@@ -2,7 +2,7 @@ import { Pipe, PipeTransform } from '@angular/core' | |||
2 | 2 | ||
3 | // Thanks: https://github.com/danrevah/ngx-pipes/blob/master/src/pipes/math/bytes.ts | 3 | // Thanks: https://github.com/danrevah/ngx-pipes/blob/master/src/pipes/math/bytes.ts |
4 | 4 | ||
5 | @Pipe({name: 'numberFormatter'}) | 5 | @Pipe({ name: 'myNumberFormatter' }) |
6 | export class NumberFormatterPipe implements PipeTransform { | 6 | export class NumberFormatterPipe implements PipeTransform { |
7 | private dictionary: Array<{max: number, type: string}> = [ | 7 | private dictionary: Array<{max: number, type: string}> = [ |
8 | { max: 1000, type: '' }, | 8 | { max: 1000, type: '' }, |
diff --git a/client/src/app/videos/video-list/shared/video-miniature.component.html b/client/src/app/videos/video-list/shared/video-miniature.component.html index f2756ca3d..7ac017235 100644 --- a/client/src/app/videos/video-list/shared/video-miniature.component.html +++ b/client/src/app/videos/video-list/shared/video-miniature.component.html | |||
@@ -11,7 +11,7 @@ | |||
11 | </a> | 11 | </a> |
12 | </span> | 12 | </span> |
13 | 13 | ||
14 | <span class="video-miniature-created-at-views">{{ video.createdAt | fromNow }} - {{ video.views | numberFormatter }} views</span> | 14 | <span class="video-miniature-created-at-views">{{ video.createdAt | myFromNow }} - {{ video.views | myNumberFormatter }} views</span> |
15 | <span class="video-miniature-account">{{ video.by }}</span> | 15 | <span class="video-miniature-account">{{ video.by }}</span> |
16 | </div> | 16 | </div> |
17 | </div> | 17 | </div> |