Skip to content

Commit 826b5dd

Browse files
authored
Merge branch 'jitsi:master' into moderator
2 parents ce875a8 + 1773bcf commit 826b5dd

20 files changed

+572
-463
lines changed

.eslintrc.js

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,29 @@
11
module.exports = {
2+
parser: '@typescript-eslint/parser',
23
extends: [
34
'@jitsi/eslint-config'
4-
]
5+
],
6+
plugins: [
7+
'@typescript-eslint'
8+
],
9+
rules: {
10+
'@typescript-eslint/member-ordering': [
11+
'error',
12+
{
13+
default: [
14+
'signature',
15+
'private-static-field',
16+
'protected-static-field',
17+
'public-static-field',
18+
'private-instance-field',
19+
'protected-instance-field',
20+
'public-instance-field',
21+
'constructor',
22+
'private-instance-method',
23+
'protected-instance-method',
24+
'public-instance-method'
25+
]
26+
}
27+
]
28+
}
529
};

JitsiConnection.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ export interface IAttachOptions {
4545
export default class JitsiConnection {
4646
private appID?: string;
4747
private token: string | null;
48-
readonly options: IConnectionOptions;
4948
private xmpp: XMPP;
49+
readonly options: IConnectionOptions;
5050

5151
/**
5252
* Creates a new JitsiConnection instance.

modules/RTCStats/RTCStats.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@ const logger = getLogger('modules/RTCStats/RTCStats');
2828
* The initialization procedure must be called once after lib-jitsi-meet is loaded.
2929
*/
3030
class RTCStats {
31-
public events: EventEmitter = new EventEmitter();
32-
public _startedWithNewConnection: boolean = true;
3331
private _defaultLogCollector: any = null;
3432
private _initialized: boolean = false;
33+
private _startedWithNewConnection: boolean = true;
3534
private _trace: any = null;
35+
public events: EventEmitter = new EventEmitter();
3636

3737
isTraceAvailable() {
3838
return this._trace !== null;

0 commit comments

Comments
 (0)