From be27ef3b4682c5639039474c39ee0d234d16f482 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Mon, 10 Feb 2020 14:25:38 +0100 Subject: Strict templates enabled --- client/src/app/shared/buttons/action-dropdown.component.ts | 6 +++--- client/src/app/shared/buttons/edit-button.component.ts | 2 +- client/src/app/shared/forms/markdown-textarea.component.ts | 2 +- client/src/app/shared/images/preview-upload.component.ts | 4 ++-- client/src/app/shared/rest/rest-table.ts | 5 +++-- .../app/shared/user-subscription/subscribe-button.component.html | 2 +- client/src/app/shared/video/abstract-video-list.ts | 3 ++- client/src/app/shared/video/modals/video-blacklist.component.ts | 4 ++-- client/src/app/shared/video/modals/video-report.component.ts | 4 ++-- client/src/app/shared/video/video-thumbnail.component.ts | 2 +- 10 files changed, 18 insertions(+), 16 deletions(-) (limited to 'client/src/app/shared') diff --git a/client/src/app/shared/buttons/action-dropdown.component.ts b/client/src/app/shared/buttons/action-dropdown.component.ts index a8b3ab16c..6649b092a 100644 --- a/client/src/app/shared/buttons/action-dropdown.component.ts +++ b/client/src/app/shared/buttons/action-dropdown.component.ts @@ -34,10 +34,10 @@ export class ActionDropdownComponent { @Input() label: string @Input() theme: DropdownTheme = 'grey' - getActions () { - if (this.actions.length !== 0 && Array.isArray(this.actions[0])) return this.actions + getActions (): DropdownAction[][] { + if (this.actions.length !== 0 && Array.isArray(this.actions[0])) return this.actions as DropdownAction[][] - return [ this.actions ] + return [ this.actions as DropdownAction[] ] } areActionsDisplayed (actions: Array | DropdownAction[]>, entry: T): boolean { diff --git a/client/src/app/shared/buttons/edit-button.component.ts b/client/src/app/shared/buttons/edit-button.component.ts index 1fe4f7b30..9cfe1a3bb 100644 --- a/client/src/app/shared/buttons/edit-button.component.ts +++ b/client/src/app/shared/buttons/edit-button.component.ts @@ -8,5 +8,5 @@ import { Component, Input } from '@angular/core' export class EditButtonComponent { @Input() label: string - @Input() routerLink: string[] = [] + @Input() routerLink: string[] | string = [] } diff --git a/client/src/app/shared/forms/markdown-textarea.component.ts b/client/src/app/shared/forms/markdown-textarea.component.ts index 19cd37573..cbcfdfe78 100644 --- a/client/src/app/shared/forms/markdown-textarea.component.ts +++ b/client/src/app/shared/forms/markdown-textarea.component.ts @@ -21,7 +21,7 @@ import { MarkdownService } from '@app/shared/renderer' export class MarkdownTextareaComponent implements ControlValueAccessor, OnInit { @Input() content = '' - @Input() classes: string[] = [] + @Input() classes: string[] | { [klass: string]: any[] | any } = [] @Input() textareaWidth = '100%' @Input() textareaHeight = '150px' @Input() previewColumn = false diff --git a/client/src/app/shared/images/preview-upload.component.ts b/client/src/app/shared/images/preview-upload.component.ts index f56f5b1f8..85a2173e9 100644 --- a/client/src/app/shared/images/preview-upload.component.ts +++ b/client/src/app/shared/images/preview-upload.component.ts @@ -26,7 +26,7 @@ export class PreviewUploadComponent implements OnInit, ControlValueAccessor { allowedExtensionsMessage = '' private serverConfig: ServerConfig - private file: File + private file: Blob constructor ( private sanitizer: DomSanitizer, @@ -49,7 +49,7 @@ export class PreviewUploadComponent implements OnInit, ControlValueAccessor { this.allowedExtensionsMessage = this.videoImageExtensions.join(', ') } - onFileChanged (file: File) { + onFileChanged (file: Blob) { this.file = file this.propagateChange(this.file) diff --git a/client/src/app/shared/rest/rest-table.ts b/client/src/app/shared/rest/rest-table.ts index f44643c0f..a33e99e25 100644 --- a/client/src/app/shared/rest/rest-table.ts +++ b/client/src/app/shared/rest/rest-table.ts @@ -65,8 +65,9 @@ export abstract class RestTable { }) } - onSearch (search: string) { - this.searchStream.next(search) + onSearch (event: Event) { + const target = event.target as HTMLInputElement + this.searchStream.next(target.value) } protected abstract loadData (): void diff --git a/client/src/app/shared/user-subscription/subscribe-button.component.html b/client/src/app/shared/user-subscription/subscribe-button.component.html index f08c88f3c..85b3d1fdb 100644 --- a/client/src/app/shared/user-subscription/subscribe-button.component.html +++ b/client/src/app/shared/user-subscription/subscribe-button.component.html @@ -55,7 +55,7 @@ - +
diff --git a/client/src/app/shared/video/abstract-video-list.ts b/client/src/app/shared/video/abstract-video-list.ts index c2fe6f754..2f5f82aa3 100644 --- a/client/src/app/shared/video/abstract-video-list.ts +++ b/client/src/app/shared/video/abstract-video-list.ts @@ -14,6 +14,7 @@ import { DisableForReuseHook } from '@app/core/routing/disable-for-reuse-hook' import { I18n } from '@ngx-translate/i18n-polyfill' import { isLastMonth, isLastWeek, isToday, isYesterday } from '@shared/core-utils/miscs/date' import { ServerConfig } from '@shared/models' +import { GlobalIconName } from '@app/shared/images/global-icon.component' enum GroupDate { UNKNOWN = 0, @@ -61,7 +62,7 @@ export abstract class AbstractVideoList implements OnInit, OnDestroy, DisableFor actions: { routerLink: string - iconName: string + iconName: GlobalIconName label: string }[] = [] diff --git a/client/src/app/shared/video/modals/video-blacklist.component.ts b/client/src/app/shared/video/modals/video-blacklist.component.ts index f0c70a365..bdd9c7b99 100644 --- a/client/src/app/shared/video/modals/video-blacklist.component.ts +++ b/client/src/app/shared/video/modals/video-blacklist.component.ts @@ -1,12 +1,12 @@ import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core' import { Notifier, RedirectService } from '@app/core' import { VideoBlacklistService } from '../../../shared/video-blacklist' -import { VideoDetails } from '../../../shared/video/video-details.model' import { I18n } from '@ngx-translate/i18n-polyfill' import { FormValidatorService } from '@app/shared/forms/form-validators/form-validator.service' import { NgbModal } from '@ng-bootstrap/ng-bootstrap' import { NgbModalRef } from '@ng-bootstrap/ng-bootstrap/modal/modal-ref' import { FormReactive, VideoBlacklistValidatorsService } from '@app/shared/forms' +import { Video } from '@app/shared/video/video.model' @Component({ selector: 'my-video-blacklist', @@ -14,7 +14,7 @@ import { FormReactive, VideoBlacklistValidatorsService } from '@app/shared/forms styleUrls: [ './video-blacklist.component.scss' ] }) export class VideoBlacklistComponent extends FormReactive implements OnInit { - @Input() video: VideoDetails = null + @Input() video: Video = null @ViewChild('modal', { static: true }) modal: NgbModal diff --git a/client/src/app/shared/video/modals/video-report.component.ts b/client/src/app/shared/video/modals/video-report.component.ts index 1d368ff17..ee991fade 100644 --- a/client/src/app/shared/video/modals/video-report.component.ts +++ b/client/src/app/shared/video/modals/video-report.component.ts @@ -1,13 +1,13 @@ import { Component, Input, OnInit, ViewChild } from '@angular/core' import { Notifier } from '@app/core' import { FormReactive } from '../../../shared/forms' -import { VideoDetails } from '../../../shared/video/video-details.model' import { I18n } from '@ngx-translate/i18n-polyfill' import { FormValidatorService } from '@app/shared/forms/form-validators/form-validator.service' import { VideoAbuseValidatorsService } from '@app/shared/forms/form-validators/video-abuse-validators.service' import { NgbModal } from '@ng-bootstrap/ng-bootstrap' import { NgbModalRef } from '@ng-bootstrap/ng-bootstrap/modal/modal-ref' import { VideoAbuseService } from '@app/shared/video-abuse' +import { Video } from '@app/shared/video/video.model' @Component({ selector: 'my-video-report', @@ -15,7 +15,7 @@ import { VideoAbuseService } from '@app/shared/video-abuse' styleUrls: [ './video-report.component.scss' ] }) export class VideoReportComponent extends FormReactive implements OnInit { - @Input() video: VideoDetails = null + @Input() video: Video = null @ViewChild('modal', { static: true }) modal: NgbModal diff --git a/client/src/app/shared/video/video-thumbnail.component.ts b/client/src/app/shared/video/video-thumbnail.component.ts index 2420ec715..111b4c8bb 100644 --- a/client/src/app/shared/video/video-thumbnail.component.ts +++ b/client/src/app/shared/video/video-thumbnail.component.ts @@ -12,7 +12,7 @@ export class VideoThumbnailComponent { @Input() video: Video @Input() nsfw = false @Input() routerLink: any[] - @Input() queryParams: any[] + @Input() queryParams: { [ p: string ]: any } @Input() displayWatchLaterPlaylist: boolean @Input() inWatchLaterPlaylist: boolean -- cgit v1.2.3