ES6 shorthand method definitions

modules/RTC/RTCBrowserType.js

@@ -28,7 +28,7 @@ var RTCBrowserType = {
      * Gets current browser type.
      * @returns {string}
      */
-    getBrowserType: function () {
+    getBrowserType() {
         return currentBrowser;
     },
 
@@ -36,10 +36,12 @@ var RTCBrowserType = {
      * Gets current browser name, split from the type.
      * @returns {string}
      */
-    getBrowserName: function () {
-        var browser = currentBrowser.split('rtc_browser.')[1];
+    getBrowserName() {
+        var browser;
         if (RTCBrowserType.isAndroid()) {
             browser = 'android';
+        } else {
+            browser = currentBrowser.split('rtc_browser.')[1];
         }
         return browser;
     },
@@ -48,7 +50,7 @@ var RTCBrowserType = {
      * Checks if current browser is Chrome.
      * @returns {boolean}
      */
-    isChrome: function () {
+    isChrome() {
         return currentBrowser === RTCBrowserType.RTC_BROWSER_CHROME;
     },
 
@@ -56,7 +58,7 @@ var RTCBrowserType = {
      * Checks if current browser is Opera.
      * @returns {boolean}
      */
-    isOpera: function () {
+    isOpera() {
         return currentBrowser === RTCBrowserType.RTC_BROWSER_OPERA;
     },
 
@@ -64,7 +66,7 @@ var RTCBrowserType = {
      * Checks if current browser is Firefox.
      * @returns {boolean}
      */
-    isFirefox: function () {
+    isFirefox() {
         return currentBrowser === RTCBrowserType.RTC_BROWSER_FIREFOX;
     },
 
@@ -72,7 +74,7 @@ var RTCBrowserType = {
      * Checks if current browser is Internet Explorer.
      * @returns {boolean}
      */
-    isIExplorer: function () {
+    isIExplorer() {
         return currentBrowser === RTCBrowserType.RTC_BROWSER_IEXPLORER;
     },
 
@@ -80,7 +82,7 @@ var RTCBrowserType = {
      * Checks if current browser is Safari.
      * @returns {boolean}
      */
-    isSafari: function () {
+    isSafari() {
         return currentBrowser === RTCBrowserType.RTC_BROWSER_SAFARI;
     },
 
@@ -88,7 +90,7 @@ var RTCBrowserType = {
      * Checks if current environment is NWJS.
      * @returns {boolean}
      */
-    isNWJS: function () {
+    isNWJS() {
         return currentBrowser === RTCBrowserType.RTC_BROWSER_NWJS;
     },
 
@@ -96,7 +98,7 @@ var RTCBrowserType = {
      * Checks if current environment is Electron.
      * @returns {boolean}
      */
-    isElectron: function () {
+    isElectron() {
         return currentBrowser === RTCBrowserType.RTC_BROWSER_ELECTRON;
     },
 
@@ -104,7 +106,7 @@ var RTCBrowserType = {
      * Checks if current environment is React Native.
      * @returns {boolean}
      */
-    isReactNative: function () {
+    isReactNative() {
         return currentBrowser === RTCBrowserType.RTC_BROWSER_REACT_NATIVE;
     },
 
@@ -112,7 +114,7 @@ var RTCBrowserType = {
      * Checks if Temasys RTC plugin is used.
      * @returns {boolean}
      */
-    isTemasysPluginUsed: function () {
+    isTemasysPluginUsed() {
         // Temasys do not support Microsoft Edge:
         // http://support.temasys.com.sg/support/solutions/articles/5000654345-can-the-temasys-webrtc-plugin-be-used-with-microsoft-edge-
         if (RTCBrowserType.isIExplorer()
@@ -129,7 +131,7 @@ var RTCBrowserType = {
      * @returns {*|boolean} 'true' if the event is supported or 'false'
      * otherwise.
      */
-    isVideoMuteOnConnInterruptedSupported: function () {
+    isVideoMuteOnConnInterruptedSupported() {
         return RTCBrowserType.isChrome();
     },
 
@@ -137,7 +139,7 @@ var RTCBrowserType = {
      * Returns Firefox version.
      * @returns {number|null}
      */
-    getFirefoxVersion: function () {
+    getFirefoxVersion() {
         return RTCBrowserType.isFirefox() ? browserVersion : null;
     },
 
@@ -145,7 +147,7 @@ var RTCBrowserType = {
      * Returns Chrome version.
      * @returns {number|null}
      */
-    getChromeVersion: function () {
+    getChromeVersion() {
         return RTCBrowserType.isChrome() ? browserVersion : null;
     },
 
@@ -154,11 +156,11 @@ var RTCBrowserType = {
      *
      * @returns {number|null}
      */
-    getIExplorerVersion: function () {
+    getIExplorerVersion() {
         return RTCBrowserType.isIExplorer() ? browserVersion : null;
     },
 
-    usesPlanB: function() {
+    usesPlanB() {
         return (
             RTCBrowserType.isChrome()
                 || RTCBrowserType.isOpera()
@@ -166,7 +168,7 @@ var RTCBrowserType = {
                 || RTCBrowserType.isTemasysPluginUsed());
     },
 
-    usesUnifiedPlan: function() {
+    usesUnifiedPlan() {
         return RTCBrowserType.isFirefox();
     },
 
@@ -174,7 +176,7 @@ var RTCBrowserType = {
      * Whether the browser is running on an android device.
      * @returns {boolean}
      */
-    isAndroid: function() {
+    isAndroid() {
         return isAndroid;
     },
 
@@ -182,7 +184,7 @@ var RTCBrowserType = {
      * Whether jitsi-meet supports simulcast on the current browser.
      * @returns {boolean}
      */
-    supportsSimulcast: function() {
+    supportsSimulcast() {
         // This mirrors what sdp-simulcast uses (which is used when deciding
         // whether to actually enable simulcast or not).
         // TODO: the logic should be in one single place.
@@ -272,7 +274,7 @@ function detectIE() {
 /**
  * Detects Electron environment.
  */
-function detectElectron (){
+function detectElectron() {
     var userAgent = navigator.userAgent;
     if (userAgent.match(/Electron/)) {
         currentBrowser = RTCBrowserType.RTC_BROWSER_ELECTRON;
@@ -283,7 +285,7 @@ function detectElectron (){
     return null;
 }
 
-function detectNWJS (){
+function detectNWJS() {
     var userAgent = navigator.userAgent;
     if (userAgent.match(/JitsiMeetNW/)) {
         currentBrowser = RTCBrowserType.RTC_BROWSER_NWJS;
@@ -308,12 +310,8 @@ function detectReactNative() {
             name = match[1];
             version = match[2];
         }
-        if (!name) {
-            name = 'react-native';
-        }
-        if (!version) {
-            version = 'unknown';
-        }
+        name || (name = 'react-native');
+        version || (version = 'unknown');
         console.info('This appears to be ' + name + ', ver: ' + version);
     } else {
         // We're not running in a React Native environment.