diff options
author | Chocobozzz <me@florianbigard.com> | 2019-04-02 18:30:26 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2019-04-02 18:30:26 +0200 |
commit | c47106315ae3c403239cda29c49b4bba51ddccb2 (patch) | |
tree | 526d2f3ba284dde6bc8d83699c0a78e86d7860eb /client/src/assets/player | |
parent | f421fa06ada7bb01d91142cc8211a65e2b390d7b (diff) | |
download | PeerTube-c47106315ae3c403239cda29c49b4bba51ddccb2.tar.gz PeerTube-c47106315ae3c403239cda29c49b4bba51ddccb2.tar.zst PeerTube-c47106315ae3c403239cda29c49b4bba51ddccb2.zip |
tslint update
Diffstat (limited to 'client/src/assets/player')
8 files changed, 24 insertions, 24 deletions
diff --git a/client/src/assets/player/p2p-media-loader/segment-url-builder.ts b/client/src/assets/player/p2p-media-loader/segment-url-builder.ts index 32e7ce4f2..fb990a19d 100644 --- a/client/src/assets/player/p2p-media-loader/segment-url-builder.ts +++ b/client/src/assets/player/p2p-media-loader/segment-url-builder.ts | |||
@@ -8,8 +8,8 @@ function segmentUrlBuilderFactory (baseUrls: string[]) { | |||
8 | 8 | ||
9 | if (i === max - 1) return segment.url | 9 | if (i === max - 1) return segment.url |
10 | 10 | ||
11 | let newBaseUrl = baseUrls[i] | 11 | const newBaseUrl = baseUrls[i] |
12 | let middlePart = newBaseUrl.endsWith('/') ? '' : '/' | 12 | const middlePart = newBaseUrl.endsWith('/') ? '' : '/' |
13 | 13 | ||
14 | return newBaseUrl + middlePart + basename(segment.url) | 14 | return newBaseUrl + middlePart + basename(segment.url) |
15 | } | 15 | } |
diff --git a/client/src/assets/player/utils.ts b/client/src/assets/player/utils.ts index 54f131310..0966027ac 100644 --- a/client/src/assets/player/utils.ts +++ b/client/src/assets/player/utils.ts | |||
@@ -61,12 +61,12 @@ function secondsToTime (seconds: number, full = false, symbol?: string) { | |||
61 | const minuteSymbol = (symbol || 'm') | 61 | const minuteSymbol = (symbol || 'm') |
62 | const secondsSymbol = full ? '' : 's' | 62 | const secondsSymbol = full ? '' : 's' |
63 | 63 | ||
64 | let hours = Math.floor(seconds / 3600) | 64 | const hours = Math.floor(seconds / 3600) |
65 | if (hours >= 1) time = hours + hourSymbol | 65 | if (hours >= 1) time = hours + hourSymbol |
66 | else if (full) time = '0' + hourSymbol | 66 | else if (full) time = '0' + hourSymbol |
67 | 67 | ||
68 | seconds %= 3600 | 68 | seconds %= 3600 |
69 | let minutes = Math.floor(seconds / 60) | 69 | const minutes = Math.floor(seconds / 60) |
70 | if (minutes >= 1 && minutes < 10 && full) time += '0' + minutes + minuteSymbol | 70 | if (minutes >= 1 && minutes < 10 && full) time += '0' + minutes + minuteSymbol |
71 | else if (minutes >= 1) time += minutes + minuteSymbol | 71 | else if (minutes >= 1) time += minutes + minuteSymbol |
72 | else if (full) time += '00' + minuteSymbol | 72 | else if (full) time += '00' + minuteSymbol |
diff --git a/client/src/assets/player/videojs-components/resolution-menu-button.ts b/client/src/assets/player/videojs-components/resolution-menu-button.ts index abcc16411..cff44de72 100644 --- a/client/src/assets/player/videojs-components/resolution-menu-button.ts +++ b/client/src/assets/player/videojs-components/resolution-menu-button.ts | |||
@@ -49,7 +49,7 @@ class ResolutionMenuButton extends MenuButton { | |||
49 | 49 | ||
50 | private addClickListener (component: any) { | 50 | private addClickListener (component: any) { |
51 | component.on('click', () => { | 51 | component.on('click', () => { |
52 | let children = this.menu.children() | 52 | const children = this.menu.children() |
53 | 53 | ||
54 | for (const child of children) { | 54 | for (const child of children) { |
55 | if (component !== child) { | 55 | if (component !== child) { |
diff --git a/client/src/assets/player/videojs-components/settings-menu-button.ts b/client/src/assets/player/videojs-components/settings-menu-button.ts index 14cb8ba43..5e09032b4 100644 --- a/client/src/assets/player/videojs-components/settings-menu-button.ts +++ b/client/src/assets/player/videojs-components/settings-menu-button.ts | |||
@@ -53,7 +53,7 @@ class SettingsButton extends Button { | |||
53 | 53 | ||
54 | onDisposeSettingsItem (event: any, name: string) { | 54 | onDisposeSettingsItem (event: any, name: string) { |
55 | if (name === undefined) { | 55 | if (name === undefined) { |
56 | let children = this.menu.children() | 56 | const children = this.menu.children() |
57 | 57 | ||
58 | while (children.length > 0) { | 58 | while (children.length > 0) { |
59 | children[0].dispose() | 59 | children[0].dispose() |
@@ -62,7 +62,7 @@ class SettingsButton extends Button { | |||
62 | 62 | ||
63 | this.addClass('vjs-hidden') | 63 | this.addClass('vjs-hidden') |
64 | } else { | 64 | } else { |
65 | let item = this.menu.getChild(name) | 65 | const item = this.menu.getChild(name) |
66 | 66 | ||
67 | if (item) { | 67 | if (item) { |
68 | item.dispose() | 68 | item.dispose() |
@@ -148,8 +148,8 @@ class SettingsButton extends Button { | |||
148 | return | 148 | return |
149 | } | 149 | } |
150 | 150 | ||
151 | let offset = this.options_.setup.maxHeightOffset | 151 | const offset = this.options_.setup.maxHeightOffset |
152 | let maxHeight = this.playerComponent.el_.offsetHeight - offset | 152 | const maxHeight = this.playerComponent.el_.offsetHeight - offset |
153 | 153 | ||
154 | if (height > maxHeight) { | 154 | if (height > maxHeight) { |
155 | height = maxHeight | 155 | height = maxHeight |
@@ -166,7 +166,7 @@ class SettingsButton extends Button { | |||
166 | buildMenu () { | 166 | buildMenu () { |
167 | this.menu = new Menu(this.player()) | 167 | this.menu = new Menu(this.player()) |
168 | this.menu.addClass('vjs-main-menu') | 168 | this.menu.addClass('vjs-main-menu') |
169 | let entries = this.options_.entries | 169 | const entries = this.options_.entries |
170 | 170 | ||
171 | if (entries.length === 0) { | 171 | if (entries.length === 0) { |
172 | this.addClass('vjs-hidden') | 172 | this.addClass('vjs-hidden') |
@@ -174,7 +174,7 @@ class SettingsButton extends Button { | |||
174 | return | 174 | return |
175 | } | 175 | } |
176 | 176 | ||
177 | for (let entry of entries) { | 177 | for (const entry of entries) { |
178 | this.addMenuItem(entry, this.options_) | 178 | this.addMenuItem(entry, this.options_) |
179 | } | 179 | } |
180 | 180 | ||
@@ -191,7 +191,7 @@ class SettingsButton extends Button { | |||
191 | } | 191 | } |
192 | 192 | ||
193 | options.name = toTitleCase(entry) | 193 | options.name = toTitleCase(entry) |
194 | let settingsMenuItem = new SettingsMenuItem(this.player(), options, entry, this as any) | 194 | const settingsMenuItem = new SettingsMenuItem(this.player(), options, entry, this as any) |
195 | 195 | ||
196 | this.menu.addChild(settingsMenuItem) | 196 | this.menu.addChild(settingsMenuItem) |
197 | 197 | ||
@@ -204,7 +204,7 @@ class SettingsButton extends Button { | |||
204 | } | 204 | } |
205 | 205 | ||
206 | resetChildren () { | 206 | resetChildren () { |
207 | for (let menuChild of this.menu.children()) { | 207 | for (const menuChild of this.menu.children()) { |
208 | menuChild.reset() | 208 | menuChild.reset() |
209 | } | 209 | } |
210 | } | 210 | } |
@@ -213,7 +213,7 @@ class SettingsButton extends Button { | |||
213 | * Hide all the sub menus | 213 | * Hide all the sub menus |
214 | */ | 214 | */ |
215 | hideChildren () { | 215 | hideChildren () { |
216 | for (let menuChild of this.menu.children()) { | 216 | for (const menuChild of this.menu.children()) { |
217 | menuChild.hideSubMenu() | 217 | menuChild.hideSubMenu() |
218 | } | 218 | } |
219 | } | 219 | } |
diff --git a/client/src/assets/player/videojs-components/settings-menu-item.ts b/client/src/assets/player/videojs-components/settings-menu-item.ts index f14959f9c..78879a2ec 100644 --- a/client/src/assets/player/videojs-components/settings-menu-item.ts +++ b/client/src/assets/player/videojs-components/settings-menu-item.ts | |||
@@ -167,7 +167,7 @@ class SettingsMenuItem extends MenuItem { | |||
167 | * @method PrefixedEvent | 167 | * @method PrefixedEvent |
168 | */ | 168 | */ |
169 | PrefixedEvent (element: any, type: any, callback: any, action = 'addEvent') { | 169 | PrefixedEvent (element: any, type: any, callback: any, action = 'addEvent') { |
170 | let prefix = ['webkit', 'moz', 'MS', 'o', ''] | 170 | const prefix = ['webkit', 'moz', 'MS', 'o', ''] |
171 | 171 | ||
172 | for (let p = 0; p < prefix.length; p++) { | 172 | for (let p = 0; p < prefix.length; p++) { |
173 | if (!prefix[p]) { | 173 | if (!prefix[p]) { |
@@ -249,7 +249,7 @@ class SettingsMenuItem extends MenuItem { | |||
249 | 249 | ||
250 | update (event?: any) { | 250 | update (event?: any) { |
251 | let target: HTMLElement = null | 251 | let target: HTMLElement = null |
252 | let subMenu = this.subMenu.name() | 252 | const subMenu = this.subMenu.name() |
253 | 253 | ||
254 | if (event && event.type === 'tap') { | 254 | if (event && event.type === 'tap') { |
255 | target = event.target | 255 | target = event.target |
@@ -264,7 +264,7 @@ class SettingsMenuItem extends MenuItem { | |||
264 | setTimeout(() => this.settingsSubMenuValueEl_.innerHTML = this.subMenu.labelEl_.innerHTML, 250) | 264 | setTimeout(() => this.settingsSubMenuValueEl_.innerHTML = this.subMenu.labelEl_.innerHTML, 250) |
265 | } else { | 265 | } else { |
266 | // Loop trough the submenu items to find the selected child | 266 | // Loop trough the submenu items to find the selected child |
267 | for (let subMenuItem of this.subMenu.menu.children_) { | 267 | for (const subMenuItem of this.subMenu.menu.children_) { |
268 | if (!(subMenuItem instanceof component)) { | 268 | if (!(subMenuItem instanceof component)) { |
269 | continue | 269 | continue |
270 | } | 270 | } |
@@ -287,7 +287,7 @@ class SettingsMenuItem extends MenuItem { | |||
287 | } | 287 | } |
288 | 288 | ||
289 | bindClickEvents () { | 289 | bindClickEvents () { |
290 | for (let item of this.subMenu.menu.children()) { | 290 | for (const item of this.subMenu.menu.children()) { |
291 | if (!(item instanceof component)) { | 291 | if (!(item instanceof component)) { |
292 | continue | 292 | continue |
293 | } | 293 | } |
@@ -307,7 +307,7 @@ class SettingsMenuItem extends MenuItem { | |||
307 | } | 307 | } |
308 | 308 | ||
309 | setMargin () { | 309 | setMargin () { |
310 | let [width] = this.size | 310 | const [ width ] = this.size |
311 | 311 | ||
312 | this.settingsSubMenuEl_.style.marginRight = `-${width}px` | 312 | this.settingsSubMenuEl_.style.marginRight = `-${width}px` |
313 | } | 313 | } |
diff --git a/client/src/assets/player/webtorrent/peertube-chunk-store.ts b/client/src/assets/player/webtorrent/peertube-chunk-store.ts index 54cc0ea64..66762bef8 100644 --- a/client/src/assets/player/webtorrent/peertube-chunk-store.ts +++ b/client/src/assets/player/webtorrent/peertube-chunk-store.ts | |||
@@ -131,7 +131,7 @@ export class PeertubeChunkStore extends EventEmitter { | |||
131 | // Chunk in store | 131 | // Chunk in store |
132 | this.db.transaction('r', this.db.chunks, async () => { | 132 | this.db.transaction('r', this.db.chunks, async () => { |
133 | const result = await this.db.chunks.get({ id: index }) | 133 | const result = await this.db.chunks.get({ id: index }) |
134 | if (result === undefined) return cb(null, new Buffer(0)) | 134 | if (result === undefined) return cb(null, Buffer.alloc(0)) |
135 | 135 | ||
136 | const buf = result.buf | 136 | const buf = result.buf |
137 | if (!opts) return this.nextTick(cb, null, buf) | 137 | if (!opts) return this.nextTick(cb, null, buf) |
@@ -162,13 +162,13 @@ export class PeertubeChunkStore extends EventEmitter { | |||
162 | } | 162 | } |
163 | 163 | ||
164 | if (this.db) { | 164 | if (this.db) { |
165 | await this.db.close() | 165 | this.db.close() |
166 | 166 | ||
167 | await this.dropDatabase(this.databaseName) | 167 | await this.dropDatabase(this.databaseName) |
168 | } | 168 | } |
169 | 169 | ||
170 | if (this.expirationDB) { | 170 | if (this.expirationDB) { |
171 | await this.expirationDB.close() | 171 | this.expirationDB.close() |
172 | this.expirationDB = null | 172 | this.expirationDB = null |
173 | } | 173 | } |
174 | 174 | ||
diff --git a/client/src/assets/player/webtorrent/video-renderer.ts b/client/src/assets/player/webtorrent/video-renderer.ts index a3415937b..4dce87112 100644 --- a/client/src/assets/player/webtorrent/video-renderer.ts +++ b/client/src/assets/player/webtorrent/video-renderer.ts | |||
@@ -29,7 +29,7 @@ function renderVideo ( | |||
29 | 29 | ||
30 | function renderMedia (file: any, elem: HTMLVideoElement, opts: RenderMediaOptions, callback: (err: Error, renderer?: any) => void) { | 30 | function renderMedia (file: any, elem: HTMLVideoElement, opts: RenderMediaOptions, callback: (err: Error, renderer?: any) => void) { |
31 | const extension = extname(file.name).toLowerCase() | 31 | const extension = extname(file.name).toLowerCase() |
32 | let preparedElem: any = undefined | 32 | let preparedElem: any |
33 | let currentTime = 0 | 33 | let currentTime = 0 |
34 | let renderer: any | 34 | let renderer: any |
35 | 35 | ||
diff --git a/client/src/assets/player/webtorrent/webtorrent-plugin.ts b/client/src/assets/player/webtorrent/webtorrent-plugin.ts index c7182acc9..eee3d4db9 100644 --- a/client/src/assets/player/webtorrent/webtorrent-plugin.ts +++ b/client/src/assets/player/webtorrent/webtorrent-plugin.ts | |||
@@ -347,7 +347,7 @@ class WebTorrentPlugin extends Plugin { | |||
347 | if (!averageDownloadSpeed) averageDownloadSpeed = this.getAndSaveActualDownloadSpeed() | 347 | if (!averageDownloadSpeed) averageDownloadSpeed = this.getAndSaveActualDownloadSpeed() |
348 | 348 | ||
349 | // Limit resolution according to player height | 349 | // Limit resolution according to player height |
350 | const playerHeight = this.playerElement.offsetHeight as number | 350 | const playerHeight = this.playerElement.offsetHeight |
351 | 351 | ||
352 | // We take the first resolution just above the player height | 352 | // We take the first resolution just above the player height |
353 | // Example: player height is 530px, we want the 720p file instead of 480p | 353 | // Example: player height is 530px, we want the 720p file instead of 480p |