diff options
author | Chocobozzz <me@florianbigard.com> | 2019-02-11 11:52:34 +0100 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2019-02-11 11:52:34 +0100 |
commit | 88108880bbdba473cfe36ecbebc1c3c4f972e102 (patch) | |
tree | b242efb3b4f0d7e49d88f2d1f2063b5b3b0489c0 /client/tslint.json | |
parent | 53a94c7cfa8368da4cd248d65df8346905938f0c (diff) | |
parent | 9b712a2017e4ab3cf12cd6bd58278905520159d0 (diff) | |
download | PeerTube-88108880bbdba473cfe36ecbebc1c3c4f972e102.tar.gz PeerTube-88108880bbdba473cfe36ecbebc1c3c4f972e102.tar.zst PeerTube-88108880bbdba473cfe36ecbebc1c3c4f972e102.zip |
Merge branch 'develop' into pr/1217
Diffstat (limited to 'client/tslint.json')
-rw-r--r-- | client/tslint.json | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/client/tslint.json b/client/tslint.json index e997088fd..fcc866ee3 100644 --- a/client/tslint.json +++ b/client/tslint.json | |||
@@ -7,10 +7,18 @@ | |||
7 | "max-line-length": [true, 140], | 7 | "max-line-length": [true, 140], |
8 | "no-floating-promises": false, | 8 | "no-floating-promises": false, |
9 | "no-unused-variable": false, // Memory issues | 9 | "no-unused-variable": false, // Memory issues |
10 | "member-ordering": [true, | 10 | "member-ordering": [true, { |
11 | "public-before-private", | 11 | "order": [ |
12 | "static-before-instance", | 12 | "public-static-field", |
13 | "variables-before-functions" | 13 | "private-static-field", |
14 | "public-instance-field", | ||
15 | "private-instance-field", | ||
16 | "public-constructor", | ||
17 | "private-constructor", | ||
18 | "public-instance-method", | ||
19 | "protected-instance-method", | ||
20 | "private-instance-method" | ||
21 | ]} | ||
14 | ], | 22 | ], |
15 | 23 | ||
16 | "angular-whitespace": [true, "check-interpolation", "check-semicolon"], | 24 | "angular-whitespace": [true, "check-interpolation", "check-semicolon"], |