diff options
author | Chocobozzz <florian.bigard@gmail.com> | 2016-05-13 14:42:14 +0200 |
---|---|---|
committer | Chocobozzz <florian.bigard@gmail.com> | 2016-05-13 14:42:14 +0200 |
commit | f03996dad65281fbb64b7b8ab31d279d7b332a22 (patch) | |
tree | 64bc0904f10a582881285e39fb72d137301483a3 | |
parent | 230809efa1e7e81ce60cd65f8b398f01a27d525b (diff) | |
download | PeerTube-f03996dad65281fbb64b7b8ab31d279d7b332a22.tar.gz PeerTube-f03996dad65281fbb64b7b8ab31d279d7b332a22.tar.zst PeerTube-f03996dad65281fbb64b7b8ab31d279d7b332a22.zip |
Fix some typescript compilations issues
-rw-r--r-- | client/.gitignore | 1 | ||||
-rw-r--r-- | client/angular/videos/components/watch/videos-watch.component.ts | 2 | ||||
-rw-r--r-- | client/typings/typings.d.ts | 13 | ||||
-rwxr-xr-x | scripts/danger/clean/modules.sh | 2 |
4 files changed, 2 insertions, 16 deletions
diff --git a/client/.gitignore b/client/.gitignore index 24129f7c5..0ab218d71 100644 --- a/client/.gitignore +++ b/client/.gitignore | |||
@@ -1,5 +1,4 @@ | |||
1 | typings | 1 | typings |
2 | !typings/typings.d.ts | ||
3 | angular/**/*.js | 2 | angular/**/*.js |
4 | angular/**/*.map | 3 | angular/**/*.map |
5 | angular/**/*.css | 4 | angular/**/*.css |
diff --git a/client/angular/videos/components/watch/videos-watch.component.ts b/client/angular/videos/components/watch/videos-watch.component.ts index 6ac2787ed..3d1829b99 100644 --- a/client/angular/videos/components/watch/videos-watch.component.ts +++ b/client/angular/videos/components/watch/videos-watch.component.ts | |||
@@ -22,7 +22,7 @@ export class VideosWatchComponent implements OnInit, CanDeactivate { | |||
22 | numPeers: number; | 22 | numPeers: number; |
23 | loading: boolean = false; | 23 | loading: boolean = false; |
24 | 24 | ||
25 | private _interval: number; | 25 | private _interval: NodeJS.Timer; |
26 | private client: any; | 26 | private client: any; |
27 | 27 | ||
28 | constructor( | 28 | constructor( |
diff --git a/client/typings/typings.d.ts b/client/typings/typings.d.ts index 579c9a586..e69de29bb 100644 --- a/client/typings/typings.d.ts +++ b/client/typings/typings.d.ts | |||
@@ -1,13 +0,0 @@ | |||
1 | /** | ||
2 | * Declares the 'commonjs' format module object that identifies the "module id" for the current module. | ||
3 | * Set a component's `moduleId` metadata property to `module.id` for module-relative urls | ||
4 | * when the generated module format is 'commonjs'. | ||
5 | */ | ||
6 | declare var module: {id: string}; | ||
7 | |||
8 | /** | ||
9 | * Declares the 'system' format string that identifies the "module id" for the current module. | ||
10 | * Set a component's `moduleId` metadata property to `__moduleName` for module-relative urls | ||
11 | * when the generated module format is 'system'. | ||
12 | */ | ||
13 | declare var __moduleName: string; | ||
diff --git a/scripts/danger/clean/modules.sh b/scripts/danger/clean/modules.sh index d357e1b77..1aa6c732b 100755 --- a/scripts/danger/clean/modules.sh +++ b/scripts/danger/clean/modules.sh | |||
@@ -3,5 +3,5 @@ | |||
3 | read -p "This will remove all node and typescript modules. Are you sure? " -n 1 -r | 3 | read -p "This will remove all node and typescript modules. Are you sure? " -n 1 -r |
4 | 4 | ||
5 | if [[ "$REPLY" =~ ^[Yy]$ ]]; then | 5 | if [[ "$REPLY" =~ ^[Yy]$ ]]; then |
6 | rm -rf node_modules client/node_modules client/typings/{browser,main}* | 6 | rm -rf node_modules client/node_modules client/typings |
7 | fi | 7 | fi |