aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2018-09-28 10:36:26 +0200
committerChocobozzz <me@florianbigard.com>2018-09-28 10:36:46 +0200
commit07524e229fa88a0d01af9d52ce124760f8ca5fa4 (patch)
tree04cf6bda11b601c0eda3dcc8525f75c6845c98f3
parentcee43cf11c31b76329fec20ce7f075ed97d1cd70 (diff)
downloadPeerTube-07524e229fa88a0d01af9d52ce124760f8ca5fa4.tar.gz
PeerTube-07524e229fa88a0d01af9d52ce124760f8ca5fa4.tar.zst
PeerTube-07524e229fa88a0d01af9d52ce124760f8ca5fa4.zip
Enable more angular options
-rw-r--r--client/tsconfig.json5
-rw-r--r--server/models/video/video-format-utils.ts2
2 files changed, 6 insertions, 1 deletions
diff --git a/client/tsconfig.json b/client/tsconfig.json
index f1d97110d..e041769dd 100644
--- a/client/tsconfig.json
+++ b/client/tsconfig.json
@@ -7,6 +7,7 @@
7 "moduleResolution": "node", 7 "moduleResolution": "node",
8 "emitDecoratorMetadata": true, 8 "emitDecoratorMetadata": true,
9 "experimentalDecorators": true, 9 "experimentalDecorators": true,
10 "noImplicitAny": false,
10 "target": "es5", 11 "target": "es5",
11 "typeRoots": [ 12 "typeRoots": [
12 "node_modules/@types" 13 "node_modules/@types"
@@ -32,6 +33,10 @@
32 "crypto": [ "./shims/noop" ] 33 "crypto": [ "./shims/noop" ]
33 } 34 }
34 }, 35 },
36 "angularCompilerOptions": {
37 "strictInjectionParameters": true,
38 "fullTemplateTypeCheck": true
39 },
35 "exclude": [ 40 "exclude": [
36 "../node_modules", 41 "../node_modules",
37 "node_modules", 42 "node_modules",
diff --git a/server/models/video/video-format-utils.ts b/server/models/video/video-format-utils.ts
index 18364a287..f23dde9b8 100644
--- a/server/models/video/video-format-utils.ts
+++ b/server/models/video/video-format-utils.ts
@@ -45,7 +45,7 @@ function videoModelToFormattedJSON (video: VideoModel, options?: VideoFormatting
45 label: VideoModel.getPrivacyLabel(video.privacy) 45 label: VideoModel.getPrivacyLabel(video.privacy)
46 }, 46 },
47 nsfw: video.nsfw, 47 nsfw: video.nsfw,
48 description: options.completeDescription === true ? video.description : video.getTruncatedDescription(), 48 description: options && options.completeDescription === true ? video.description : video.getTruncatedDescription(),
49 isLocal: video.isOwned(), 49 isLocal: video.isOwned(),
50 duration: video.duration, 50 duration: video.duration,
51 views: video.views, 51 views: video.views,