7 files changed, 41 insertions, 41 deletions

diff --git a/client/app/videos/shared/video.model.ts b/client/app/videos/shared/video.model.ts
index eec537c9e..2b018ad86 100644
--- a/client/app/videos/shared/video.model.ts
+++ b/client/app/videos/shared/video.model.ts
@@ -11,7 +11,7 @@ export class Video {
   by: string;
   duration: string;
 
-  private static createDurationString(duration: number): string {
+  private static createDurationString(duration: number) {
     const minutes = Math.floor(duration / 60);
     const seconds = duration % 60;
     const minutes_padding = minutes >= 10 ? '' : '0';
@@ -20,7 +20,7 @@ export class Video {
     return minutes_padding + minutes.toString() + ':' + seconds_padding + seconds.toString();
   }
 
-  private static createByString(author: string, podUrl: string): string {
+  private static createByString(author: string, podUrl: string) {
     let [ host, port ] = podUrl.replace(/^https?:\/\//, '').split(':');
 
     if (port === '80' || port === '443') {
@@ -57,7 +57,7 @@ export class Video {
     this.by = Video.createByString(hash.author, hash.podUrl);
   }
 
-  isRemovableBy(user): boolean {
+  isRemovableBy(user) {
     return this.isLocal === true && user && this.author === user.username;
   }
 }
diff --git a/client/app/videos/shared/video.service.ts b/client/app/videos/shared/video.service.ts
index 78789c3cc..b6e0800a0 100644
--- a/client/app/videos/shared/video.service.ts
+++ b/client/app/videos/shared/video.service.ts
@@ -10,30 +10,30 @@ import { Video } from './video.model';
 
 @Injectable()
 export class VideoService {
-  private _baseVideoUrl = '/api/v1/videos/';
+  private static BASE_VIDEO_URL = '/api/v1/videos/';
 
-  constructor (private http: Http, private _authService: AuthService) {}
+  constructor(private http: Http, private authService: AuthService) {}
 
   getVideos(pagination: Pagination, sort: SortField) {
     const params = this.createPaginationParams(pagination);
 
     if (sort) params.set('sort', sort);
 
-    return this.http.get(this._baseVideoUrl, { search: params })
+    return this.http.get(VideoService.BASE_VIDEO_URL, { search: params })
                     .map(res => res.json())
                     .map(this.extractVideos)
                     .catch(this.handleError);
   }
 
   getVideo(id: string) {
-    return this.http.get(this._baseVideoUrl + id)
+    return this.http.get(VideoService.BASE_VIDEO_URL + id)
                     .map(res => <Video> res.json())
                     .catch(this.handleError);
   }
 
   removeVideo(id: string) {
-    const options = this._authService.getAuthRequestOptions();
-    return this.http.delete(this._baseVideoUrl + id, options)
+    const options = this.authService.getAuthRequestOptions();
+    return this.http.delete(VideoService.BASE_VIDEO_URL + id, options)
                     .map(res => <number> res.status)
                     .catch(this.handleError);
   }
@@ -44,13 +44,13 @@ export class VideoService {
     if (search.field) params.set('field', search.field);
     if (sort) params.set('sort', sort);
 
-    return this.http.get(this._baseVideoUrl + 'search/' + encodeURIComponent(search.value), { search: params })
+    return this.http.get(VideoService.BASE_VIDEO_URL + 'search/' + encodeURIComponent(search.value), { search: params })
                     .map(res => res.json())
                     .map(this.extractVideos)
                     .catch(this.handleError);
   }
 
-  private extractVideos (body: any) {
+  private extractVideos(body: any) {
     const videos_json = body.data;
     const totalVideos = body.total;
     const videos = [];
@@ -61,7 +61,7 @@ export class VideoService {
     return { videos, totalVideos };
   }
 
-  private handleError (error: Response) {
+  private handleError(error: Response) {
     console.error(error);
     return Observable.throw(error.json().error || 'Server error');
   }
diff --git a/client/app/videos/video-add/video-add.component.ts b/client/app/videos/video-add/video-add.component.ts
index ca583a103..67a04a2b4 100644
--- a/client/app/videos/video-add/video-add.component.ts
+++ b/client/app/videos/video-add/video-add.component.ts
@@ -7,7 +7,7 @@ import { PROGRESSBAR_DIRECTIVES } from 'ng2-bootstrap/components/progressbar';
 import { AuthService, User } from '../../users/index';
 
 // TODO: import it with systemjs
-declare var jQuery:any;
+declare var jQuery: any;
 
 @Component({
   selector: 'my-videos-add',
diff --git a/client/app/videos/video-list/video-list.component.ts b/client/app/videos/video-list/video-list.component.ts
index a88fb379a..3f54c98ce 100644
--- a/client/app/videos/video-list/video-list.component.ts
+++ b/client/app/videos/video-list/video-list.component.ts
@@ -31,26 +31,26 @@ export class VideoListComponent implements OnInit {
     total: 0
   };
   sort: SortField;
-  loading: boolean = false;
+  loading = false;
 
   private search: Search;
 
   constructor(
-    private _authService: AuthService,
-    private _videoService: VideoService,
-    private _routeParams: RouteParams,
-    private _router: Router
+    private authService: AuthService,
+    private videoService: VideoService,
+    private routeParams: RouteParams,
+    private router: Router
   ) {
     this.search = {
-      value: this._routeParams.get('search'),
-      field: <SearchField>this._routeParams.get('field')
+      value: this.routeParams.get('search'),
+      field: <SearchField>this.routeParams.get('field')
     };
 
-    this.sort = <SortField>this._routeParams.get('sort') || '-createdDate';
+    this.sort = <SortField>this.routeParams.get('sort') || '-createdDate';
   }
 
   ngOnInit() {
-    if (this._authService.isLoggedIn()) {
+    if (this.authService.isLoggedIn()) {
       this.user = User.load();
     }
 
@@ -64,9 +64,9 @@ export class VideoListComponent implements OnInit {
     let observable = null;
 
     if (this.search.value !== null) {
-      observable = this._videoService.searchVideos(this.search, this.pagination, this.sort);
+      observable = this.videoService.searchVideos(this.search, this.pagination, this.sort);
     } else {
-      observable = this._videoService.getVideos(this.pagination, this.sort);
+      observable = this.videoService.getVideos(this.pagination, this.sort);
     }
 
     observable.subscribe(
@@ -79,7 +79,7 @@ export class VideoListComponent implements OnInit {
     );
   }
 
-  onRemoved(video: Video): void {
+  onRemoved(video: Video) {
     this.videos.splice(this.videos.indexOf(video), 1);
   }
 
@@ -95,7 +95,7 @@ export class VideoListComponent implements OnInit {
       params.field = this.search.field;
     }
 
-    this._router.navigate(['VideosList', params]);
+    this.router.navigate(['VideosList', params]);
     this.getVideos();
   }
 }
diff --git a/client/app/videos/video-list/video-miniature.component.ts b/client/app/videos/video-list/video-miniature.component.ts
index 817636768..73416607a 100644
--- a/client/app/videos/video-list/video-miniature.component.ts
+++ b/client/app/videos/video-list/video-miniature.component.ts
@@ -19,9 +19,9 @@ export class VideoMiniatureComponent {
   @Input() video: Video;
   @Input() user: User;
 
-  hovering: boolean = false;
+  hovering = false;
 
-  constructor(private _videoService: VideoService) {}
+  constructor(private videoService: VideoService) {}
 
   onHover() {
     this.hovering = true;
@@ -31,13 +31,13 @@ export class VideoMiniatureComponent {
     this.hovering = false;
   }
 
-  displayRemoveIcon(): boolean {
+  displayRemoveIcon() {
     return this.hovering && this.video.isRemovableBy(this.user);
   }
 
   removeVideo(id: string) {
     if (confirm('Do you really want to remove this video?')) {
-      this._videoService.removeVideo(id).subscribe(
+      this.videoService.removeVideo(id).subscribe(
         status => this.removed.emit(true),
         error => alert(error)
       );
diff --git a/client/app/videos/video-list/video-sort.component.ts b/client/app/videos/video-list/video-sort.component.ts
index d00d7ed49..ed06c7510 100644
--- a/client/app/videos/video-list/video-sort.component.ts
+++ b/client/app/videos/video-list/video-sort.component.ts
@@ -26,7 +26,7 @@ export class VideoSortComponent {
     return Object.keys(this.sortChoices);
   }
 
-  getStringChoice(choiceKey: SortField): string {
+  getStringChoice(choiceKey: SortField) {
     return this.sortChoices[choiceKey];
   }
 
diff --git a/client/app/videos/video-watch/video-watch.component.ts b/client/app/videos/video-watch/video-watch.component.ts
index 891e6563f..c159b4004 100644
--- a/client/app/videos/video-watch/video-watch.component.ts
+++ b/client/app/videos/video-watch/video-watch.component.ts
@@ -23,21 +23,21 @@ export class VideoWatchComponent implements OnInit, CanDeactivate {
   numPeers: number;
   loading: boolean = false;
 
-  private _interval: NodeJS.Timer;
+  private interval: NodeJS.Timer;
   private client: any;
 
   constructor(
-    private _videoService: VideoService,
-    private _routeParams: RouteParams,
-    private _elementRef: ElementRef
+    private videoService: VideoService,
+    private routeParams: RouteParams,
+    private elementRef: ElementRef
   ) {
     // TODO: use a service
     this.client = new WebTorrent({ dht: false });
   }
 
   ngOnInit() {
-    let id = this._routeParams.get('id');
-    this._videoService.getVideo(id).subscribe(
+    let id = this.routeParams.get('id');
+    this.videoService.getVideo(id).subscribe(
       video => this.loadVideo(video),
       error => alert(error)
     );
@@ -50,7 +50,7 @@ export class VideoWatchComponent implements OnInit, CanDeactivate {
     this.client.add(this.video.magnetUri, (torrent) => {
       this.loading = false;
       console.log('Added ' + this.video.magnetUri + '.');
-      torrent.files[0].appendTo(this._elementRef.nativeElement.querySelector('.embed-responsive'), (err) => {
+      torrent.files[0].appendTo(this.elementRef.nativeElement.querySelector('.embed-responsive'), (err) => {
         if (err) {
           alert('Cannot append the file.');
           console.error(err);
@@ -58,7 +58,7 @@ export class VideoWatchComponent implements OnInit, CanDeactivate {
       });
 
       // Refresh each second
-      this._interval = setInterval(() => {
+      this.interval = setInterval(() => {
         this.downloadSpeed = torrent.downloadSpeed;
         this.uploadSpeed = torrent.uploadSpeed;
         this.numPeers = torrent.numPeers;
@@ -66,9 +66,9 @@ export class VideoWatchComponent implements OnInit, CanDeactivate {
     });
   }
 
-  routerCanDeactivate(next: ComponentInstruction, prev: ComponentInstruction) : any {
+  routerCanDeactivate(next: ComponentInstruction, prev: ComponentInstruction) {
     console.log('Removing video from webtorrent.');
-    clearInterval(this._interval);
+    clearInterval(this.interval);
     this.client.remove(this.video.magnetUri);
     return true;
   }