From c323efb9cdc6a605242d112ac0c9db9f67eabaad Mon Sep 17 00:00:00 2001
From: Chocobozzz <florian.bigard@gmail.com>
Date: Fri, 12 Aug 2016 17:35:00 +0200
Subject: Update webtorrent -> 0.96
---
client/src/app/shared/search/search.component.ts | 2 +-
.../app/videos/video-watch/video-watch.component.ts | 21 ++++++++++++++-------
2 files changed, 15 insertions(+), 8 deletions(-)
(limited to 'client/src')
diff --git a/client/src/app/shared/search/search.component.ts b/client/src/app/shared/search/search.component.ts
index e864fbc17..219997e85 100644
--- a/client/src/app/shared/search/search.component.ts
+++ b/client/src/app/shared/search/search.component.ts
@@ -28,7 +28,7 @@ export class SearchComponent implements OnInit {
constructor(private searchService: SearchService) {}
ngOnInit() {
- // Subscribe is the search changed
+ // Subscribe if the search changed
// Usually changed by videos list component
this.searchService.updateSearch.subscribe(
newSearchCriterias => {
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 09255de5d..bc0e3157d 100644
--- a/client/src/app/videos/video-watch/video-watch.component.ts
+++ b/client/src/app/videos/video-watch/video-watch.component.ts
@@ -1,4 +1,4 @@
-import { Component, ElementRef, OnDestroy, OnInit } from '@angular/core';
+import { Component, ElementRef, NgZone, OnDestroy, OnInit } from '@angular/core';
import { ActivatedRoute } from '@angular/router';
import { BytesPipe } from 'angular-pipes/src/math/bytes.pipe';
@@ -31,6 +31,7 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
constructor(
private elementRef: ElementRef,
+ private ngZone: NgZone,
private route: ActivatedRoute,
private videoService: VideoService,
private webTorrentService: WebTorrentService
@@ -65,12 +66,7 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
}
});
- // Refresh each second
- this.torrentInfosInterval = setInterval(() => {
- this.downloadSpeed = torrent.downloadSpeed;
- this.numPeers = torrent.numPeers;
- this.uploadSpeed = torrent.uploadSpeed;
- }, 1000);
+ this.runInProgress(torrent);
});
}
@@ -99,4 +95,15 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
this.error = true;
console.error('The video load seems to be abnormally long.');
}
+
+ private runInProgress(torrent: any) {
+ // Refresh each second
+ this.torrentInfosInterval = setInterval(() => {
+ this.ngZone.run(() => {
+ this.downloadSpeed = torrent.downloadSpeed;
+ this.numPeers = torrent.numPeers;
+ this.uploadSpeed = torrent.uploadSpeed;
+ });
+ }, 1000);
+ }
}
--
cgit v1.2.3