From 16b5525950c27172b8426e03cbb1c59794cfc44c Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Thu, 1 Aug 2019 11:38:26 +0200 Subject: Update Angular -> 8.2.0 --- client/src/app/search/search.service.ts | 2 +- client/src/app/videos/videos-routing.module.ts | 6 +++--- .../peertube-load-progress-bar.ts | 1 + .../videojs-components/resolution-menu-button.ts | 2 ++ .../videojs-components/settings-menu-button.ts | 12 +++++++++++ .../videojs-components/settings-menu-item.ts | 16 +++++++++++++++ client/src/tsconfig.app.json | 23 ---------------------- 7 files changed, 35 insertions(+), 27 deletions(-) delete mode 100644 client/src/tsconfig.app.json (limited to 'client/src') diff --git a/client/src/app/search/search.service.ts b/client/src/app/search/search.service.ts index 8f137a321..bb5532757 100644 --- a/client/src/app/search/search.service.ts +++ b/client/src/app/search/search.service.ts @@ -5,7 +5,7 @@ import { Observable } from 'rxjs' import { ComponentPagination } from '@app/shared/rest/component-pagination.model' import { VideoService } from '@app/shared/video/video.service' import { RestExtractor, RestService } from '@app/shared' -import { environment } from 'environments/environment' +import { environment } from '../../environments/environment' import { ResultList, Video as VideoServerModel, VideoChannel as VideoChannelServerModel } from '../../../../shared' import { Video } from '@app/shared/video/video.model' import { AdvancedSearch } from '@app/search/advanced-search.model' diff --git a/client/src/app/videos/videos-routing.module.ts b/client/src/app/videos/videos-routing.module.ts index bc7520207..4eaae93cb 100644 --- a/client/src/app/videos/videos-routing.module.ts +++ b/client/src/app/videos/videos-routing.module.ts @@ -77,7 +77,7 @@ const videosRoutes: Routes = [ }, { path: 'upload', - loadChildren: () => import('app/videos/+video-edit/video-add.module').then(m => m.VideoAddModule), + loadChildren: () => import('@app/videos/+video-edit/video-add.module').then(m => m.VideoAddModule), data: { meta: { title: 'Upload a video' @@ -86,7 +86,7 @@ const videosRoutes: Routes = [ }, { path: 'update/:uuid', - loadChildren: () => import('app/videos/+video-edit/video-update.module').then(m => m.VideoUpdateModule), + loadChildren: () => import('@app/videos/+video-edit/video-update.module').then(m => m.VideoUpdateModule), data: { meta: { title: 'Edit a video' @@ -95,7 +95,7 @@ const videosRoutes: Routes = [ }, { path: 'watch', - loadChildren: () => import('app/videos/+video-watch/video-watch.module').then(m => m.VideoWatchModule), + loadChildren: () => import('@app/videos/+video-watch/video-watch.module').then(m => m.VideoWatchModule), data: { preload: 3000 } diff --git a/client/src/assets/player/videojs-components/peertube-load-progress-bar.ts b/client/src/assets/player/videojs-components/peertube-load-progress-bar.ts index 9a0e3b550..b594fc1c5 100644 --- a/client/src/assets/player/videojs-components/peertube-load-progress-bar.ts +++ b/client/src/assets/player/videojs-components/peertube-load-progress-bar.ts @@ -6,6 +6,7 @@ import { Player } from 'video.js' const Component: VideoJSComponentInterface = videojsUntyped.getComponent('Component') class PeerTubeLoadProgressBar extends Component { + partEls_: any[] constructor (player: Player, options: any) { super(player, options) 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 cff44de72..aeb48888f 100644 --- a/client/src/assets/player/videojs-components/resolution-menu-button.ts +++ b/client/src/assets/player/videojs-components/resolution-menu-button.ts @@ -9,6 +9,8 @@ const Menu: VideoJSComponentInterface = videojsUntyped.getComponent('Menu') const MenuButton: VideoJSComponentInterface = videojsUntyped.getComponent('MenuButton') class ResolutionMenuButton extends MenuButton { label: HTMLElement + labelEl_: any + player: Player constructor (player: Player, options: any) { super(player, options) 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 5e09032b4..3e8b5fc94 100644 --- a/client/src/assets/player/videojs-components/settings-menu-button.ts +++ b/client/src/assets/player/videojs-components/settings-menu-button.ts @@ -14,6 +14,18 @@ const Menu: VideoJSComponentInterface = videojsUntyped.getComponent('Menu') const Component: VideoJSComponentInterface = videojsUntyped.getComponent('Component') class SettingsButton extends Button { + playerComponent = videojs.Player + dialog: any + dialogEl: any + menu: any + panel: any + panelChild: any + + addSettingsItemHandler: Function + disposeSettingsItemHandler: Function + playerClickHandler: Function + userInactiveHandler: Function + constructor (player: videojs.Player, options: any) { super(player, options) 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 24b7e0c70..b738300ae 100644 --- a/client/src/assets/player/videojs-components/settings-menu-item.ts +++ b/client/src/assets/player/videojs-components/settings-menu-item.ts @@ -12,6 +12,22 @@ const MenuItem: VideoJSComponentInterface = videojsUntyped.getComponent('MenuIte const component: VideoJSComponentInterface = videojsUntyped.getComponent('Component') class SettingsMenuItem extends MenuItem { + settingsButton: any + dialog: any + mainMenu: any + panel: any + panelChild: any + panelChildEl: any + size: any + menuToLoad: string + subMenu: any + + submenuClickHandler: Function + transitionEndHandler: Function + + settingsSubMenuTitleEl_: any + settingsSubMenuValueEl_: any + settingsSubMenuEl_: any constructor (player: videojs.Player, options: any, entry: string, menuButton: VideoJSComponentInterface) { super(player, options) diff --git a/client/src/tsconfig.app.json b/client/src/tsconfig.app.json deleted file mode 100644 index 4656e40f5..000000000 --- a/client/src/tsconfig.app.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "extends": "../tsconfig.json", - "compilerOptions": { - "outDir": "../out-tsc/app", - "baseUrl": "./", - "types": [], - "lib": [ - "es2017", - "es2016", - "es2015", - "dom" - ] - }, - "exclude": [ - "test.ts", - "**/*.spec.ts", - "../node_modules/ngx-clipboard/**/*.spec.ts" - ], - "include": [ - "**/*.ts", - "../node_modules/ngx-clipboard/*/**.ts" - ] -} -- cgit v1.2.3