Merge pull request #240 from jitsi/es2015

ES6 for JitsiTrackEvents

.jshintrc

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

JitsiConference.js

@@ -9,8 +9,8 @@ var JitsiConferenceErrors = require("./JitsiConferenceErrors");
 var JitsiParticipant = require("./JitsiParticipant");
 var Statistics = require("./modules/statistics/statistics");
 var JitsiDTMFManager = require('./modules/DTMF/JitsiDTMFManager');
-var JitsiTrackEvents = require("./JitsiTrackEvents");
-var JitsiTrackErrors = require("./JitsiTrackErrors");
+import * as JitsiTrackErrors from "./JitsiTrackErrors";
+import * as JitsiTrackEvents from "./JitsiTrackEvents";
 var JitsiTrackError = require("./JitsiTrackError");
 var Settings = require("./modules/settings/Settings");
 var ComponentsVersions = require("./modules/version/ComponentsVersions");

JitsiMeetJS.js

@@ -7,8 +7,8 @@ var JitsiConnectionEvents = require("./JitsiConnectionEvents");
 var JitsiMediaDevicesEvents = require('./JitsiMediaDevicesEvents');
 var JitsiConnectionErrors = require("./JitsiConnectionErrors");
 var JitsiConferenceErrors = require("./JitsiConferenceErrors");
-var JitsiTrackEvents = require("./JitsiTrackEvents");
-var JitsiTrackErrors = require("./JitsiTrackErrors");
+import * as JitsiTrackErrors from "./JitsiTrackErrors";
+import * as JitsiTrackEvents from "./JitsiTrackEvents";
 var JitsiTrackError = require("./JitsiTrackError");
 var JitsiRecorderErrors = require("./JitsiRecorderErrors");
 var Logger = require("jitsi-meet-logger");

JitsiTrackError.js

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

JitsiTrackErrors.js

@@ -1,65 +1,63 @@
 /**
- * Enumeration with the errors for the JitsiTrack objects.
- * @type {{string: string}}
+ * The errors for the JitsiTrack objects.
  */
-module.exports = {
-    /**
-     * An error which indicates that requested video resolution is not supported
-     * by a webcam.
-     */
-    UNSUPPORTED_RESOLUTION: "gum.unsupported_resolution",
-    /**
-     * An error which indicates that the jidesha extension for Firefox is
-     * needed to proceed with screen sharing, and that it is not installed.
-     */
-    FIREFOX_EXTENSION_NEEDED: "gum.firefox_extension_needed",
-    /**
-     * An error which indicates that the jidesha extension for Chrome is
-     * failed to install.
-     */
-    CHROME_EXTENSION_INSTALLATION_ERROR:
-        "gum.chrome_extension_installation_error",
-    /**
-     * An error which indicates that user canceled screen sharing window
-     * selection dialog in jidesha extension for Chrome.
-     */
-    CHROME_EXTENSION_USER_CANCELED:
-        "gum.chrome_extension_user_canceled",
-    /**
-     * Generic error for jidesha extension for Chrome.
-     */
-    CHROME_EXTENSION_GENERIC_ERROR:
-        "gum.chrome_extension_generic_error",
-    /**
-     * Generic getUserMedia error.
-     */
-    GENERAL: "gum.general",
-    /**
-     * An error which indicates that user denied permission to share requested
-     * device.
-     */
-    PERMISSION_DENIED: "gum.permission_denied",
-    /**
-     * An error which indicates that requested device was not found.
-     */
-    NOT_FOUND: "gum.not_found",
-    /**
-     * An error which indicates that some of requested constraints in
-     * getUserMedia call were not satisfied.
-     */
-    CONSTRAINT_FAILED: "gum.constraint_failed",
-    /**
-     * An error which indicates that track has been already disposed and cannot
-     * be longer used.
-     */
-    TRACK_IS_DISPOSED: "track.track_is_disposed",
-    /**
-     * An error which indicates that track has no MediaStream associated.
-     */
-    TRACK_NO_STREAM_FOUND: "track.no_stream_found",
-    /**
-     * An error which indicates that track is currently in progress of muting or
-     * unmuting itself.
-     */
-    TRACK_MUTE_UNMUTE_IN_PROGRESS: "track.mute_unmute_inprogress"
-};
+
+/**
+ * Generic error for jidesha extension for Chrome.
+ */
+export const CHROME_EXTENSION_GENERIC_ERROR
+    = "gum.chrome_extension_generic_error";
+/**
+ * An error which indicates that the jidesha extension for Chrome is
+ * failed to install.
+ */
+export const CHROME_EXTENSION_INSTALLATION_ERROR
+    = "gum.chrome_extension_installation_error";
+/**
+ * An error which indicates that user canceled screen sharing window
+ * selection dialog in jidesha extension for Chrome.
+ */
+export const CHROME_EXTENSION_USER_CANCELED
+    ="gum.chrome_extension_user_canceled";
+/**
+ * An error which indicates that some of requested constraints in
+ * getUserMedia call were not satisfied.
+ */
+export const CONSTRAINT_FAILED = "gum.constraint_failed";
+/**
+ * An error which indicates that the jidesha extension for Firefox is
+ * needed to proceed with screen sharing, and that it is not installed.
+ */
+export const FIREFOX_EXTENSION_NEEDED = "gum.firefox_extension_needed";
+/**
+ * Generic getUserMedia error.
+ */
+export const GENERAL = "gum.general";
+/**
+ * An error which indicates that requested device was not found.
+ */
+export const NOT_FOUND = "gum.not_found";
+/**
+ * An error which indicates that user denied permission to share requested
+ * device.
+ */
+export const PERMISSION_DENIED = "gum.permission_denied";
+/**
+ * An error which indicates that track has been already disposed and cannot
+ * be longer used.
+ */
+export const TRACK_IS_DISPOSED = "track.track_is_disposed";
+/**
+ * An error which indicates that track is currently in progress of muting or
+ * unmuting itself.
+ */
+export const TRACK_MUTE_UNMUTE_IN_PROGRESS = "track.mute_unmute_inprogress";
+/**
+ * An error which indicates that track has no MediaStream associated.
+ */
+export const TRACK_NO_STREAM_FOUND = "track.no_stream_found";
+/**
+ * An error which indicates that requested video resolution is not supported
+ * by a webcam.
+ */
+export const UNSUPPORTED_RESOLUTION = "gum.unsupported_resolution";

JitsiTrackEvents.js

@@ -1,28 +1,24 @@
-var JitsiTrackEvents = {
-    /**
-     * A media track mute status was changed.
-     */
-    TRACK_MUTE_CHANGED: "track.trackMuteChanged",
-    /**
-     * Audio levels of a this track was changed.
-     */
-    TRACK_AUDIO_LEVEL_CHANGED: "track.audioLevelsChanged",
-    /**
-     * The media track was removed to the conference.
-     */
-    LOCAL_TRACK_STOPPED: "track.stopped",
-    /**
-     * The video type("camera" or "desktop") of the track was changed.
-     */
-    TRACK_VIDEOTYPE_CHANGED: "track.videoTypeChanged",
-    /**
-     * The audio output of the track was changed.
-     */
-    TRACK_AUDIO_OUTPUT_CHANGED: "track.audioOutputChanged",
-    /**
-     * Detects that no audio have been sent.
-     */
-    TRACK_AUDIO_NOT_WORKING: "track.audioNotWorking"
-};
-
-module.exports = JitsiTrackEvents;
+/**
+ * The media track was removed to the conference.
+ */
+export const LOCAL_TRACK_STOPPED = "track.stopped";
+/**
+ * Audio levels of a this track was changed.
+ */
+export const TRACK_AUDIO_LEVEL_CHANGED = "track.audioLevelsChanged";
+/**
+ * Detects that no audio have been sent.
+ */
+export const TRACK_AUDIO_NOT_WORKING = "track.audioNotWorking";
+/**
+ * The audio output of the track was changed.
+ */
+export const TRACK_AUDIO_OUTPUT_CHANGED = "track.audioOutputChanged";
+/**
+ * A media track mute status was changed.
+ */
+export const TRACK_MUTE_CHANGED = "track.trackMuteChanged";
+/**
+ * The video type("camera" or "desktop") of the track was changed.
+ */
+export const TRACK_VIDEOTYPE_CHANGED = "track.videoTypeChanged";

modules/RTC/JitsiLocalTrack.js

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

modules/RTC/JitsiRemoteTrack.js

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

modules/RTC/JitsiTrack.js

@@ -3,7 +3,7 @@ var logger = require("jitsi-meet-logger").getLogger(__filename);
 var RTCBrowserType = require("./RTCBrowserType");
 var RTCEvents = require("../../service/RTC/RTCEvents");
 var RTCUtils = require("./RTCUtils");
-var JitsiTrackEvents = require("../../JitsiTrackEvents");
+import * as JitsiTrackEvents from "../../JitsiTrackEvents";
 var EventEmitter = require("events");
 var MediaType = require("../../service/RTC/MediaType");
 

modules/RTC/RTCUtils.js

@@ -13,7 +13,7 @@ var AdapterJS = require("./adapter.screenshare");
 var SDPUtil = require("../xmpp/SDPUtil");
 var EventEmitter = require("events");
 var screenObtainer = require("./ScreenObtainer");
-var JitsiTrackErrors = require("../../JitsiTrackErrors");
+import * as JitsiTrackErrors from "../../JitsiTrackErrors";
 var JitsiTrackError = require("../../JitsiTrackError");
 var MediaType = require("../../service/RTC/MediaType");
 var VideoType = require("../../service/RTC/VideoType");

modules/RTC/ScreenObtainer.js

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