소스 검색

Merge pull request #240 from jitsi/es2015

ES6 for JitsiTrackEvents
master
hristoterezov 9 년 전
부모
커밋
95ac892e87
11개의 변경된 파일97개의 추가작업 그리고 102개의 파일을 삭제
  1. 1
    0
      .jshintrc
  2. 2
    2
      JitsiConference.js
  3. 2
    2
      JitsiMeetJS.js
  4. 1
    1
      JitsiTrackError.js
  5. 61
    63
      JitsiTrackErrors.js
  6. 24
    28
      JitsiTrackEvents.js
  7. 2
    2
      modules/RTC/JitsiLocalTrack.js
  8. 1
    1
      modules/RTC/JitsiRemoteTrack.js
  9. 1
    1
      modules/RTC/JitsiTrack.js
  10. 1
    1
      modules/RTC/RTCUtils.js
  11. 1
    1
      modules/RTC/ScreenObtainer.js

+ 1
- 0
.jshintrc 파일 보기

3
     "asi": false, // true: Tolerate Automatic Semicolon Insertion (no semicolons)
3
     "asi": false, // true: Tolerate Automatic Semicolon Insertion (no semicolons)
4
     "browser": true, // Web Browser (window, document, etc)
4
     "browser": true, // Web Browser (window, document, etc)
5
     "curly": false, // true: Require {} for every new block or scope
5
     "curly": false, // true: Require {} for every new block or scope
6
+    "esversion": 6,
6
     "evil": true, // true: Tolerate use of `eval` and `new Function()`
7
     "evil": true, // true: Tolerate use of `eval` and `new Function()`
7
     "expr": true, // true: Tolerate `ExpressionStatement` as Programs
8
     "expr": true, // true: Tolerate `ExpressionStatement` as Programs
8
     "indent": 4, // {int} Number of spaces to use for indentation
9
     "indent": 4, // {int} Number of spaces to use for indentation

+ 2
- 2
JitsiConference.js 파일 보기

9
 var JitsiParticipant = require("./JitsiParticipant");
9
 var JitsiParticipant = require("./JitsiParticipant");
10
 var Statistics = require("./modules/statistics/statistics");
10
 var Statistics = require("./modules/statistics/statistics");
11
 var JitsiDTMFManager = require('./modules/DTMF/JitsiDTMFManager');
11
 var JitsiDTMFManager = require('./modules/DTMF/JitsiDTMFManager');
12
-var JitsiTrackEvents = require("./JitsiTrackEvents");
13
-var JitsiTrackErrors = require("./JitsiTrackErrors");
12
+import * as JitsiTrackErrors from "./JitsiTrackErrors";
13
+import * as JitsiTrackEvents from "./JitsiTrackEvents";
14
 var JitsiTrackError = require("./JitsiTrackError");
14
 var JitsiTrackError = require("./JitsiTrackError");
15
 var Settings = require("./modules/settings/Settings");
15
 var Settings = require("./modules/settings/Settings");
16
 var ComponentsVersions = require("./modules/version/ComponentsVersions");
16
 var ComponentsVersions = require("./modules/version/ComponentsVersions");

+ 2
- 2
JitsiMeetJS.js 파일 보기

7
 var JitsiMediaDevicesEvents = require('./JitsiMediaDevicesEvents');
7
 var JitsiMediaDevicesEvents = require('./JitsiMediaDevicesEvents');
8
 var JitsiConnectionErrors = require("./JitsiConnectionErrors");
8
 var JitsiConnectionErrors = require("./JitsiConnectionErrors");
9
 var JitsiConferenceErrors = require("./JitsiConferenceErrors");
9
 var JitsiConferenceErrors = require("./JitsiConferenceErrors");
10
-var JitsiTrackEvents = require("./JitsiTrackEvents");
11
-var JitsiTrackErrors = require("./JitsiTrackErrors");
10
+import * as JitsiTrackErrors from "./JitsiTrackErrors";
11
+import * as JitsiTrackEvents from "./JitsiTrackEvents";
12
 var JitsiTrackError = require("./JitsiTrackError");
12
 var JitsiTrackError = require("./JitsiTrackError");
13
 var JitsiRecorderErrors = require("./JitsiRecorderErrors");
13
 var JitsiRecorderErrors = require("./JitsiRecorderErrors");
14
 var Logger = require("jitsi-meet-logger");
14
 var Logger = require("jitsi-meet-logger");

+ 1
- 1
JitsiTrackError.js 파일 보기

1
-var JitsiTrackErrors = require("./JitsiTrackErrors");
1
+import * as JitsiTrackErrors from "./JitsiTrackErrors";
2
 
2
 
3
 var TRACK_ERROR_TO_MESSAGE_MAP = {};
3
 var TRACK_ERROR_TO_MESSAGE_MAP = {};
4
 
4
 

+ 61
- 63
JitsiTrackErrors.js 파일 보기

1
 /**
1
 /**
2
- * Enumeration with the errors for the JitsiTrack objects.
3
- * @type {{string: string}}
2
+ * The errors for the JitsiTrack objects.
4
  */
3
  */
5
-module.exports = {
6
-    /**
7
-     * An error which indicates that requested video resolution is not supported
8
-     * by a webcam.
9
-     */
10
-    UNSUPPORTED_RESOLUTION: "gum.unsupported_resolution",
11
-    /**
12
-     * An error which indicates that the jidesha extension for Firefox is
13
-     * needed to proceed with screen sharing, and that it is not installed.
14
-     */
15
-    FIREFOX_EXTENSION_NEEDED: "gum.firefox_extension_needed",
16
-    /**
17
-     * An error which indicates that the jidesha extension for Chrome is
18
-     * failed to install.
19
-     */
20
-    CHROME_EXTENSION_INSTALLATION_ERROR:
21
-        "gum.chrome_extension_installation_error",
22
-    /**
23
-     * An error which indicates that user canceled screen sharing window
24
-     * selection dialog in jidesha extension for Chrome.
25
-     */
26
-    CHROME_EXTENSION_USER_CANCELED:
27
-        "gum.chrome_extension_user_canceled",
28
-    /**
29
-     * Generic error for jidesha extension for Chrome.
30
-     */
31
-    CHROME_EXTENSION_GENERIC_ERROR:
32
-        "gum.chrome_extension_generic_error",
33
-    /**
34
-     * Generic getUserMedia error.
35
-     */
36
-    GENERAL: "gum.general",
37
-    /**
38
-     * An error which indicates that user denied permission to share requested
39
-     * device.
40
-     */
41
-    PERMISSION_DENIED: "gum.permission_denied",
42
-    /**
43
-     * An error which indicates that requested device was not found.
44
-     */
45
-    NOT_FOUND: "gum.not_found",
46
-    /**
47
-     * An error which indicates that some of requested constraints in
48
-     * getUserMedia call were not satisfied.
49
-     */
50
-    CONSTRAINT_FAILED: "gum.constraint_failed",
51
-    /**
52
-     * An error which indicates that track has been already disposed and cannot
53
-     * be longer used.
54
-     */
55
-    TRACK_IS_DISPOSED: "track.track_is_disposed",
56
-    /**
57
-     * An error which indicates that track has no MediaStream associated.
58
-     */
59
-    TRACK_NO_STREAM_FOUND: "track.no_stream_found",
60
-    /**
61
-     * An error which indicates that track is currently in progress of muting or
62
-     * unmuting itself.
63
-     */
64
-    TRACK_MUTE_UNMUTE_IN_PROGRESS: "track.mute_unmute_inprogress"
65
-};
4
+
5
+/**
6
+ * Generic error for jidesha extension for Chrome.
7
+ */
8
+export const CHROME_EXTENSION_GENERIC_ERROR
9
+    = "gum.chrome_extension_generic_error";
10
+/**
11
+ * An error which indicates that the jidesha extension for Chrome is
12
+ * failed to install.
13
+ */
14
+export const CHROME_EXTENSION_INSTALLATION_ERROR
15
+    = "gum.chrome_extension_installation_error";
16
+/**
17
+ * An error which indicates that user canceled screen sharing window
18
+ * selection dialog in jidesha extension for Chrome.
19
+ */
20
+export const CHROME_EXTENSION_USER_CANCELED
21
+    ="gum.chrome_extension_user_canceled";
22
+/**
23
+ * An error which indicates that some of requested constraints in
24
+ * getUserMedia call were not satisfied.
25
+ */
26
+export const CONSTRAINT_FAILED = "gum.constraint_failed";
27
+/**
28
+ * An error which indicates that the jidesha extension for Firefox is
29
+ * needed to proceed with screen sharing, and that it is not installed.
30
+ */
31
+export const FIREFOX_EXTENSION_NEEDED = "gum.firefox_extension_needed";
32
+/**
33
+ * Generic getUserMedia error.
34
+ */
35
+export const GENERAL = "gum.general";
36
+/**
37
+ * An error which indicates that requested device was not found.
38
+ */
39
+export const NOT_FOUND = "gum.not_found";
40
+/**
41
+ * An error which indicates that user denied permission to share requested
42
+ * device.
43
+ */
44
+export const PERMISSION_DENIED = "gum.permission_denied";
45
+/**
46
+ * An error which indicates that track has been already disposed and cannot
47
+ * be longer used.
48
+ */
49
+export const TRACK_IS_DISPOSED = "track.track_is_disposed";
50
+/**
51
+ * An error which indicates that track is currently in progress of muting or
52
+ * unmuting itself.
53
+ */
54
+export const TRACK_MUTE_UNMUTE_IN_PROGRESS = "track.mute_unmute_inprogress";
55
+/**
56
+ * An error which indicates that track has no MediaStream associated.
57
+ */
58
+export const TRACK_NO_STREAM_FOUND = "track.no_stream_found";
59
+/**
60
+ * An error which indicates that requested video resolution is not supported
61
+ * by a webcam.
62
+ */
63
+export const UNSUPPORTED_RESOLUTION = "gum.unsupported_resolution";

+ 24
- 28
JitsiTrackEvents.js 파일 보기

1
-var JitsiTrackEvents = {
2
-    /**
3
-     * A media track mute status was changed.
4
-     */
5
-    TRACK_MUTE_CHANGED: "track.trackMuteChanged",
6
-    /**
7
-     * Audio levels of a this track was changed.
8
-     */
9
-    TRACK_AUDIO_LEVEL_CHANGED: "track.audioLevelsChanged",
10
-    /**
11
-     * The media track was removed to the conference.
12
-     */
13
-    LOCAL_TRACK_STOPPED: "track.stopped",
14
-    /**
15
-     * The video type("camera" or "desktop") of the track was changed.
16
-     */
17
-    TRACK_VIDEOTYPE_CHANGED: "track.videoTypeChanged",
18
-    /**
19
-     * The audio output of the track was changed.
20
-     */
21
-    TRACK_AUDIO_OUTPUT_CHANGED: "track.audioOutputChanged",
22
-    /**
23
-     * Detects that no audio have been sent.
24
-     */
25
-    TRACK_AUDIO_NOT_WORKING: "track.audioNotWorking"
26
-};
27
-
28
-module.exports = JitsiTrackEvents;
1
+/**
2
+ * The media track was removed to the conference.
3
+ */
4
+export const LOCAL_TRACK_STOPPED = "track.stopped";
5
+/**
6
+ * Audio levels of a this track was changed.
7
+ */
8
+export const TRACK_AUDIO_LEVEL_CHANGED = "track.audioLevelsChanged";
9
+/**
10
+ * Detects that no audio have been sent.
11
+ */
12
+export const TRACK_AUDIO_NOT_WORKING = "track.audioNotWorking";
13
+/**
14
+ * The audio output of the track was changed.
15
+ */
16
+export const TRACK_AUDIO_OUTPUT_CHANGED = "track.audioOutputChanged";
17
+/**
18
+ * A media track mute status was changed.
19
+ */
20
+export const TRACK_MUTE_CHANGED = "track.trackMuteChanged";
21
+/**
22
+ * The video type("camera" or "desktop") of the track was changed.
23
+ */
24
+export const TRACK_VIDEOTYPE_CHANGED = "track.videoTypeChanged";

+ 2
- 2
modules/RTC/JitsiLocalTrack.js 파일 보기

2
 var logger = require("jitsi-meet-logger").getLogger(__filename);
2
 var logger = require("jitsi-meet-logger").getLogger(__filename);
3
 var JitsiTrack = require("./JitsiTrack");
3
 var JitsiTrack = require("./JitsiTrack");
4
 var RTCBrowserType = require("./RTCBrowserType");
4
 var RTCBrowserType = require("./RTCBrowserType");
5
-var JitsiTrackEvents = require('../../JitsiTrackEvents');
6
-var JitsiTrackErrors = require("../../JitsiTrackErrors");
5
+import * as JitsiTrackErrors from "../../JitsiTrackErrors";
6
+import * as JitsiTrackEvents from "../../JitsiTrackEvents";
7
 var JitsiTrackError = require("../../JitsiTrackError");
7
 var JitsiTrackError = require("../../JitsiTrackError");
8
 var RTCEvents = require("../../service/RTC/RTCEvents");
8
 var RTCEvents = require("../../service/RTC/RTCEvents");
9
 var RTCUtils = require("./RTCUtils");
9
 var RTCUtils = require("./RTCUtils");

+ 1
- 1
modules/RTC/JitsiRemoteTrack.js 파일 보기

1
 var JitsiTrack = require("./JitsiTrack");
1
 var JitsiTrack = require("./JitsiTrack");
2
-var JitsiTrackEvents = require("../../JitsiTrackEvents");
2
+import * as JitsiTrackEvents from "../../JitsiTrackEvents";
3
 var RTCBrowserType = require("./RTCBrowserType");
3
 var RTCBrowserType = require("./RTCBrowserType");
4
 var Statistics = require("../statistics/statistics");
4
 var Statistics = require("../statistics/statistics");
5
 var AdapterJS = require("./adapter.screenshare");
5
 var AdapterJS = require("./adapter.screenshare");

+ 1
- 1
modules/RTC/JitsiTrack.js 파일 보기

3
 var RTCBrowserType = require("./RTCBrowserType");
3
 var RTCBrowserType = require("./RTCBrowserType");
4
 var RTCEvents = require("../../service/RTC/RTCEvents");
4
 var RTCEvents = require("../../service/RTC/RTCEvents");
5
 var RTCUtils = require("./RTCUtils");
5
 var RTCUtils = require("./RTCUtils");
6
-var JitsiTrackEvents = require("../../JitsiTrackEvents");
6
+import * as JitsiTrackEvents from "../../JitsiTrackEvents";
7
 var EventEmitter = require("events");
7
 var EventEmitter = require("events");
8
 var MediaType = require("../../service/RTC/MediaType");
8
 var MediaType = require("../../service/RTC/MediaType");
9
 
9
 

+ 1
- 1
modules/RTC/RTCUtils.js 파일 보기

13
 var SDPUtil = require("../xmpp/SDPUtil");
13
 var SDPUtil = require("../xmpp/SDPUtil");
14
 var EventEmitter = require("events");
14
 var EventEmitter = require("events");
15
 var screenObtainer = require("./ScreenObtainer");
15
 var screenObtainer = require("./ScreenObtainer");
16
-var JitsiTrackErrors = require("../../JitsiTrackErrors");
16
+import * as JitsiTrackErrors from "../../JitsiTrackErrors";
17
 var JitsiTrackError = require("../../JitsiTrackError");
17
 var JitsiTrackError = require("../../JitsiTrackError");
18
 var MediaType = require("../../service/RTC/MediaType");
18
 var MediaType = require("../../service/RTC/MediaType");
19
 var VideoType = require("../../service/RTC/VideoType");
19
 var VideoType = require("../../service/RTC/VideoType");

+ 1
- 1
modules/RTC/ScreenObtainer.js 파일 보기

3
 var logger = require("jitsi-meet-logger").getLogger(__filename);
3
 var logger = require("jitsi-meet-logger").getLogger(__filename);
4
 var RTCBrowserType = require("./RTCBrowserType");
4
 var RTCBrowserType = require("./RTCBrowserType");
5
 var AdapterJS = require("./adapter.screenshare");
5
 var AdapterJS = require("./adapter.screenshare");
6
-var JitsiTrackErrors = require("../../JitsiTrackErrors");
6
+import * as JitsiTrackErrors from "../../JitsiTrackErrors";
7
 var JitsiTrackError = require("../../JitsiTrackError");
7
 var JitsiTrackError = require("../../JitsiTrackError");
8
 var GlobalOnErrorHandler = require("../util/GlobalOnErrorHandler");
8
 var GlobalOnErrorHandler = require("../util/GlobalOnErrorHandler");
9
 
9
 

Loading…
취소
저장