diff options
author | Chocobozzz <me@florianbigard.com> | 2019-08-01 11:38:26 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2019-08-01 11:38:47 +0200 |
commit | 16b5525950c27172b8426e03cbb1c59794cfc44c (patch) | |
tree | e29f0dd37058cc90cdff07f7ab0df281e7db3505 /client/src | |
parent | 1f8ac02436237f0a4f2f10b8c37b28578cc5a411 (diff) | |
download | PeerTube-16b5525950c27172b8426e03cbb1c59794cfc44c.tar.gz PeerTube-16b5525950c27172b8426e03cbb1c59794cfc44c.tar.zst PeerTube-16b5525950c27172b8426e03cbb1c59794cfc44c.zip |
Update Angular -> 8.2.0
Diffstat (limited to 'client/src')
7 files changed, 35 insertions, 27 deletions
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' | |||
5 | import { ComponentPagination } from '@app/shared/rest/component-pagination.model' | 5 | import { ComponentPagination } from '@app/shared/rest/component-pagination.model' |
6 | import { VideoService } from '@app/shared/video/video.service' | 6 | import { VideoService } from '@app/shared/video/video.service' |
7 | import { RestExtractor, RestService } from '@app/shared' | 7 | import { RestExtractor, RestService } from '@app/shared' |
8 | import { environment } from 'environments/environment' | 8 | import { environment } from '../../environments/environment' |
9 | import { ResultList, Video as VideoServerModel, VideoChannel as VideoChannelServerModel } from '../../../../shared' | 9 | import { ResultList, Video as VideoServerModel, VideoChannel as VideoChannelServerModel } from '../../../../shared' |
10 | import { Video } from '@app/shared/video/video.model' | 10 | import { Video } from '@app/shared/video/video.model' |
11 | import { AdvancedSearch } from '@app/search/advanced-search.model' | 11 | 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 = [ | |||
77 | }, | 77 | }, |
78 | { | 78 | { |
79 | path: 'upload', | 79 | path: 'upload', |
80 | loadChildren: () => import('app/videos/+video-edit/video-add.module').then(m => m.VideoAddModule), | 80 | loadChildren: () => import('@app/videos/+video-edit/video-add.module').then(m => m.VideoAddModule), |
81 | data: { | 81 | data: { |
82 | meta: { | 82 | meta: { |
83 | title: 'Upload a video' | 83 | title: 'Upload a video' |
@@ -86,7 +86,7 @@ const videosRoutes: Routes = [ | |||
86 | }, | 86 | }, |
87 | { | 87 | { |
88 | path: 'update/:uuid', | 88 | path: 'update/:uuid', |
89 | loadChildren: () => import('app/videos/+video-edit/video-update.module').then(m => m.VideoUpdateModule), | 89 | loadChildren: () => import('@app/videos/+video-edit/video-update.module').then(m => m.VideoUpdateModule), |
90 | data: { | 90 | data: { |
91 | meta: { | 91 | meta: { |
92 | title: 'Edit a video' | 92 | title: 'Edit a video' |
@@ -95,7 +95,7 @@ const videosRoutes: Routes = [ | |||
95 | }, | 95 | }, |
96 | { | 96 | { |
97 | path: 'watch', | 97 | path: 'watch', |
98 | loadChildren: () => import('app/videos/+video-watch/video-watch.module').then(m => m.VideoWatchModule), | 98 | loadChildren: () => import('@app/videos/+video-watch/video-watch.module').then(m => m.VideoWatchModule), |
99 | data: { | 99 | data: { |
100 | preload: 3000 | 100 | preload: 3000 |
101 | } | 101 | } |
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' | |||
6 | const Component: VideoJSComponentInterface = videojsUntyped.getComponent('Component') | 6 | const Component: VideoJSComponentInterface = videojsUntyped.getComponent('Component') |
7 | 7 | ||
8 | class PeerTubeLoadProgressBar extends Component { | 8 | class PeerTubeLoadProgressBar extends Component { |
9 | partEls_: any[] | ||
9 | 10 | ||
10 | constructor (player: Player, options: any) { | 11 | constructor (player: Player, options: any) { |
11 | super(player, options) | 12 | 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') | |||
9 | const MenuButton: VideoJSComponentInterface = videojsUntyped.getComponent('MenuButton') | 9 | const MenuButton: VideoJSComponentInterface = videojsUntyped.getComponent('MenuButton') |
10 | class ResolutionMenuButton extends MenuButton { | 10 | class ResolutionMenuButton extends MenuButton { |
11 | label: HTMLElement | 11 | label: HTMLElement |
12 | labelEl_: any | ||
13 | player: Player | ||
12 | 14 | ||
13 | constructor (player: Player, options: any) { | 15 | constructor (player: Player, options: any) { |
14 | super(player, options) | 16 | 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') | |||
14 | const Component: VideoJSComponentInterface = videojsUntyped.getComponent('Component') | 14 | const Component: VideoJSComponentInterface = videojsUntyped.getComponent('Component') |
15 | 15 | ||
16 | class SettingsButton extends Button { | 16 | class SettingsButton extends Button { |
17 | playerComponent = videojs.Player | ||
18 | dialog: any | ||
19 | dialogEl: any | ||
20 | menu: any | ||
21 | panel: any | ||
22 | panelChild: any | ||
23 | |||
24 | addSettingsItemHandler: Function | ||
25 | disposeSettingsItemHandler: Function | ||
26 | playerClickHandler: Function | ||
27 | userInactiveHandler: Function | ||
28 | |||
17 | constructor (player: videojs.Player, options: any) { | 29 | constructor (player: videojs.Player, options: any) { |
18 | super(player, options) | 30 | super(player, options) |
19 | 31 | ||
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 | |||
12 | const component: VideoJSComponentInterface = videojsUntyped.getComponent('Component') | 12 | const component: VideoJSComponentInterface = videojsUntyped.getComponent('Component') |
13 | 13 | ||
14 | class SettingsMenuItem extends MenuItem { | 14 | class SettingsMenuItem extends MenuItem { |
15 | settingsButton: any | ||
16 | dialog: any | ||
17 | mainMenu: any | ||
18 | panel: any | ||
19 | panelChild: any | ||
20 | panelChildEl: any | ||
21 | size: any | ||
22 | menuToLoad: string | ||
23 | subMenu: any | ||
24 | |||
25 | submenuClickHandler: Function | ||
26 | transitionEndHandler: Function | ||
27 | |||
28 | settingsSubMenuTitleEl_: any | ||
29 | settingsSubMenuValueEl_: any | ||
30 | settingsSubMenuEl_: any | ||
15 | 31 | ||
16 | constructor (player: videojs.Player, options: any, entry: string, menuButton: VideoJSComponentInterface) { | 32 | constructor (player: videojs.Player, options: any, entry: string, menuButton: VideoJSComponentInterface) { |
17 | super(player, options) | 33 | 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 @@ | |||
1 | { | ||
2 | "extends": "../tsconfig.json", | ||
3 | "compilerOptions": { | ||
4 | "outDir": "../out-tsc/app", | ||
5 | "baseUrl": "./", | ||
6 | "types": [], | ||
7 | "lib": [ | ||
8 | "es2017", | ||
9 | "es2016", | ||
10 | "es2015", | ||
11 | "dom" | ||
12 | ] | ||
13 | }, | ||
14 | "exclude": [ | ||
15 | "test.ts", | ||
16 | "**/*.spec.ts", | ||
17 | "../node_modules/ngx-clipboard/**/*.spec.ts" | ||
18 | ], | ||
19 | "include": [ | ||
20 | "**/*.ts", | ||
21 | "../node_modules/ngx-clipboard/*/**.ts" | ||
22 | ] | ||
23 | } | ||