aboutsummaryrefslogtreecommitdiffhomepage
path: root/client/src
diff options
context:
space:
mode:
Diffstat (limited to 'client/src')
-rw-r--r--client/src/app/shared/video-caption/video-caption.service.ts2
-rw-r--r--client/src/app/videos/+video-edit/video-add-components/video-send.ts1
-rw-r--r--client/src/assets/player/peertube-player.ts1
-rw-r--r--client/src/shims/http.ts2
-rw-r--r--client/src/shims/https.ts2
-rw-r--r--client/src/shims/noop.ts4
-rw-r--r--client/src/shims/path.ts2
7 files changed, 6 insertions, 8 deletions
diff --git a/client/src/app/shared/video-caption/video-caption.service.ts b/client/src/app/shared/video-caption/video-caption.service.ts
index 994882451..08fd61265 100644
--- a/client/src/app/shared/video-caption/video-caption.service.ts
+++ b/client/src/app/shared/video-caption/video-caption.service.ts
@@ -76,7 +76,7 @@ export class VideoCaptionService {
76 } 76 }
77 } 77 }
78 78
79 if (observables.length === 0) return of(true) 79 if (observables.length === 0) return of(undefined)
80 80
81 return forkJoin(observables) 81 return forkJoin(observables)
82 } 82 }
diff --git a/client/src/app/videos/+video-edit/video-add-components/video-send.ts b/client/src/app/videos/+video-edit/video-add-components/video-send.ts
index bfe588676..6d1bac3f2 100644
--- a/client/src/app/videos/+video-edit/video-add-components/video-send.ts
+++ b/client/src/app/videos/+video-edit/video-add-components/video-send.ts
@@ -13,7 +13,6 @@ import { VideoEdit } from '@app/shared/video/video-edit.model'
13import { populateAsyncUserVideoChannels } from '@app/shared/misc/utils' 13import { populateAsyncUserVideoChannels } from '@app/shared/misc/utils'
14 14
15export abstract class VideoSend extends FormReactive implements OnInit, CanComponentDeactivate { 15export abstract class VideoSend extends FormReactive implements OnInit, CanComponentDeactivate {
16
17 userVideoChannels: { id: number, label: string, support: string }[] = [] 16 userVideoChannels: { id: number, label: string, support: string }[] = []
18 videoPrivacies: VideoConstant<VideoPrivacy>[] = [] 17 videoPrivacies: VideoConstant<VideoPrivacy>[] = []
19 videoCaptions: VideoCaptionEdit[] = [] 18 videoCaptions: VideoCaptionEdit[] = []
diff --git a/client/src/assets/player/peertube-player.ts b/client/src/assets/player/peertube-player.ts
index 0f9836c5e..eca2ce6c3 100644
--- a/client/src/assets/player/peertube-player.ts
+++ b/client/src/assets/player/peertube-player.ts
@@ -2,7 +2,6 @@ import { VideoFile } from '../../../../shared/models/videos'
2 2
3import 'videojs-hotkeys' 3import 'videojs-hotkeys'
4import 'videojs-dock' 4import 'videojs-dock'
5import 'videojs-contextmenu'
6import 'videojs-contextmenu-ui' 5import 'videojs-contextmenu-ui'
7import './peertube-link-button' 6import './peertube-link-button'
8import './resolution-menu-button' 7import './resolution-menu-button'
diff --git a/client/src/shims/http.ts b/client/src/shims/http.ts
index a759400cb..1b1767aab 100644
--- a/client/src/shims/http.ts
+++ b/client/src/shims/http.ts
@@ -1 +1 @@
module.exports = require('stream-http'); \ No newline at end of file module.exports = require('stream-http')
diff --git a/client/src/shims/https.ts b/client/src/shims/https.ts
index 1da6f8adb..f5ef70430 100644
--- a/client/src/shims/https.ts
+++ b/client/src/shims/https.ts
@@ -1 +1 @@
module.exports = require('https-browserify'); \ No newline at end of file module.exports = require('https-browserify')
diff --git a/client/src/shims/noop.ts b/client/src/shims/noop.ts
index 338e16104..899b69bf3 100644
--- a/client/src/shims/noop.ts
+++ b/client/src/shims/noop.ts
@@ -1,3 +1,3 @@
1// Does nothing. Used to shim out node.js modules 1// Does nothing. Used to shim out node.js modules
2// which are no-ops in the browser. 2// which are no-ops in the browser.
3export const NOOP = 0; \ No newline at end of file 3export const NOOP = 0 \ No newline at end of file
diff --git a/client/src/shims/path.ts b/client/src/shims/path.ts
index 74b6913d8..1f8c61a07 100644
--- a/client/src/shims/path.ts
+++ b/client/src/shims/path.ts
@@ -1 +1 @@
module.exports = require('path-browserify'); \ No newline at end of file module.exports = require('path-browserify')