Bläddra i källkod

ES6 shorthand method definitions

dev1
Lyubo Marinov 9 år sedan
förälder
incheckning
147ca8e123
1 ändrade filer med 26 tillägg och 28 borttagningar
  1. 26
    28
      modules/RTC/RTCBrowserType.js

+ 26
- 28
modules/RTC/RTCBrowserType.js Visa fil

28
      * Gets current browser type.
28
      * Gets current browser type.
29
      * @returns {string}
29
      * @returns {string}
30
      */
30
      */
31
-    getBrowserType: function () {
31
+    getBrowserType() {
32
         return currentBrowser;
32
         return currentBrowser;
33
     },
33
     },
34
 
34
 
36
      * Gets current browser name, split from the type.
36
      * Gets current browser name, split from the type.
37
      * @returns {string}
37
      * @returns {string}
38
      */
38
      */
39
-    getBrowserName: function () {
40
-        var browser = currentBrowser.split('rtc_browser.')[1];
39
+    getBrowserName() {
40
+        var browser;
41
         if (RTCBrowserType.isAndroid()) {
41
         if (RTCBrowserType.isAndroid()) {
42
             browser = 'android';
42
             browser = 'android';
43
+        } else {
44
+            browser = currentBrowser.split('rtc_browser.')[1];
43
         }
45
         }
44
         return browser;
46
         return browser;
45
     },
47
     },
48
      * Checks if current browser is Chrome.
50
      * Checks if current browser is Chrome.
49
      * @returns {boolean}
51
      * @returns {boolean}
50
      */
52
      */
51
-    isChrome: function () {
53
+    isChrome() {
52
         return currentBrowser === RTCBrowserType.RTC_BROWSER_CHROME;
54
         return currentBrowser === RTCBrowserType.RTC_BROWSER_CHROME;
53
     },
55
     },
54
 
56
 
56
      * Checks if current browser is Opera.
58
      * Checks if current browser is Opera.
57
      * @returns {boolean}
59
      * @returns {boolean}
58
      */
60
      */
59
-    isOpera: function () {
61
+    isOpera() {
60
         return currentBrowser === RTCBrowserType.RTC_BROWSER_OPERA;
62
         return currentBrowser === RTCBrowserType.RTC_BROWSER_OPERA;
61
     },
63
     },
62
 
64
 
64
      * Checks if current browser is Firefox.
66
      * Checks if current browser is Firefox.
65
      * @returns {boolean}
67
      * @returns {boolean}
66
      */
68
      */
67
-    isFirefox: function () {
69
+    isFirefox() {
68
         return currentBrowser === RTCBrowserType.RTC_BROWSER_FIREFOX;
70
         return currentBrowser === RTCBrowserType.RTC_BROWSER_FIREFOX;
69
     },
71
     },
70
 
72
 
72
      * Checks if current browser is Internet Explorer.
74
      * Checks if current browser is Internet Explorer.
73
      * @returns {boolean}
75
      * @returns {boolean}
74
      */
76
      */
75
-    isIExplorer: function () {
77
+    isIExplorer() {
76
         return currentBrowser === RTCBrowserType.RTC_BROWSER_IEXPLORER;
78
         return currentBrowser === RTCBrowserType.RTC_BROWSER_IEXPLORER;
77
     },
79
     },
78
 
80
 
80
      * Checks if current browser is Safari.
82
      * Checks if current browser is Safari.
81
      * @returns {boolean}
83
      * @returns {boolean}
82
      */
84
      */
83
-    isSafari: function () {
85
+    isSafari() {
84
         return currentBrowser === RTCBrowserType.RTC_BROWSER_SAFARI;
86
         return currentBrowser === RTCBrowserType.RTC_BROWSER_SAFARI;
85
     },
87
     },
86
 
88
 
88
      * Checks if current environment is NWJS.
90
      * Checks if current environment is NWJS.
89
      * @returns {boolean}
91
      * @returns {boolean}
90
      */
92
      */
91
-    isNWJS: function () {
93
+    isNWJS() {
92
         return currentBrowser === RTCBrowserType.RTC_BROWSER_NWJS;
94
         return currentBrowser === RTCBrowserType.RTC_BROWSER_NWJS;
93
     },
95
     },
94
 
96
 
96
      * Checks if current environment is Electron.
98
      * Checks if current environment is Electron.
97
      * @returns {boolean}
99
      * @returns {boolean}
98
      */
100
      */
99
-    isElectron: function () {
101
+    isElectron() {
100
         return currentBrowser === RTCBrowserType.RTC_BROWSER_ELECTRON;
102
         return currentBrowser === RTCBrowserType.RTC_BROWSER_ELECTRON;
101
     },
103
     },
102
 
104
 
104
      * Checks if current environment is React Native.
106
      * Checks if current environment is React Native.
105
      * @returns {boolean}
107
      * @returns {boolean}
106
      */
108
      */
107
-    isReactNative: function () {
109
+    isReactNative() {
108
         return currentBrowser === RTCBrowserType.RTC_BROWSER_REACT_NATIVE;
110
         return currentBrowser === RTCBrowserType.RTC_BROWSER_REACT_NATIVE;
109
     },
111
     },
110
 
112
 
112
      * Checks if Temasys RTC plugin is used.
114
      * Checks if Temasys RTC plugin is used.
113
      * @returns {boolean}
115
      * @returns {boolean}
114
      */
116
      */
115
-    isTemasysPluginUsed: function () {
117
+    isTemasysPluginUsed() {
116
         // Temasys do not support Microsoft Edge:
118
         // Temasys do not support Microsoft Edge:
117
         // http://support.temasys.com.sg/support/solutions/articles/5000654345-can-the-temasys-webrtc-plugin-be-used-with-microsoft-edge-
119
         // http://support.temasys.com.sg/support/solutions/articles/5000654345-can-the-temasys-webrtc-plugin-be-used-with-microsoft-edge-
118
         if (RTCBrowserType.isIExplorer()
120
         if (RTCBrowserType.isIExplorer()
129
      * @returns {*|boolean} 'true' if the event is supported or 'false'
131
      * @returns {*|boolean} 'true' if the event is supported or 'false'
130
      * otherwise.
132
      * otherwise.
131
      */
133
      */
132
-    isVideoMuteOnConnInterruptedSupported: function () {
134
+    isVideoMuteOnConnInterruptedSupported() {
133
         return RTCBrowserType.isChrome();
135
         return RTCBrowserType.isChrome();
134
     },
136
     },
135
 
137
 
137
      * Returns Firefox version.
139
      * Returns Firefox version.
138
      * @returns {number|null}
140
      * @returns {number|null}
139
      */
141
      */
140
-    getFirefoxVersion: function () {
142
+    getFirefoxVersion() {
141
         return RTCBrowserType.isFirefox() ? browserVersion : null;
143
         return RTCBrowserType.isFirefox() ? browserVersion : null;
142
     },
144
     },
143
 
145
 
145
      * Returns Chrome version.
147
      * Returns Chrome version.
146
      * @returns {number|null}
148
      * @returns {number|null}
147
      */
149
      */
148
-    getChromeVersion: function () {
150
+    getChromeVersion() {
149
         return RTCBrowserType.isChrome() ? browserVersion : null;
151
         return RTCBrowserType.isChrome() ? browserVersion : null;
150
     },
152
     },
151
 
153
 
154
      *
156
      *
155
      * @returns {number|null}
157
      * @returns {number|null}
156
      */
158
      */
157
-    getIExplorerVersion: function () {
159
+    getIExplorerVersion() {
158
         return RTCBrowserType.isIExplorer() ? browserVersion : null;
160
         return RTCBrowserType.isIExplorer() ? browserVersion : null;
159
     },
161
     },
160
 
162
 
161
-    usesPlanB: function() {
163
+    usesPlanB() {
162
         return (
164
         return (
163
             RTCBrowserType.isChrome()
165
             RTCBrowserType.isChrome()
164
                 || RTCBrowserType.isOpera()
166
                 || RTCBrowserType.isOpera()
166
                 || RTCBrowserType.isTemasysPluginUsed());
168
                 || RTCBrowserType.isTemasysPluginUsed());
167
     },
169
     },
168
 
170
 
169
-    usesUnifiedPlan: function() {
171
+    usesUnifiedPlan() {
170
         return RTCBrowserType.isFirefox();
172
         return RTCBrowserType.isFirefox();
171
     },
173
     },
172
 
174
 
174
      * Whether the browser is running on an android device.
176
      * Whether the browser is running on an android device.
175
      * @returns {boolean}
177
      * @returns {boolean}
176
      */
178
      */
177
-    isAndroid: function() {
179
+    isAndroid() {
178
         return isAndroid;
180
         return isAndroid;
179
     },
181
     },
180
 
182
 
182
      * Whether jitsi-meet supports simulcast on the current browser.
184
      * Whether jitsi-meet supports simulcast on the current browser.
183
      * @returns {boolean}
185
      * @returns {boolean}
184
      */
186
      */
185
-    supportsSimulcast: function() {
187
+    supportsSimulcast() {
186
         // This mirrors what sdp-simulcast uses (which is used when deciding
188
         // This mirrors what sdp-simulcast uses (which is used when deciding
187
         // whether to actually enable simulcast or not).
189
         // whether to actually enable simulcast or not).
188
         // TODO: the logic should be in one single place.
190
         // TODO: the logic should be in one single place.
272
 /**
274
 /**
273
  * Detects Electron environment.
275
  * Detects Electron environment.
274
  */
276
  */
275
-function detectElectron (){
277
+function detectElectron() {
276
     var userAgent = navigator.userAgent;
278
     var userAgent = navigator.userAgent;
277
     if (userAgent.match(/Electron/)) {
279
     if (userAgent.match(/Electron/)) {
278
         currentBrowser = RTCBrowserType.RTC_BROWSER_ELECTRON;
280
         currentBrowser = RTCBrowserType.RTC_BROWSER_ELECTRON;
283
     return null;
285
     return null;
284
 }
286
 }
285
 
287
 
286
-function detectNWJS (){
288
+function detectNWJS() {
287
     var userAgent = navigator.userAgent;
289
     var userAgent = navigator.userAgent;
288
     if (userAgent.match(/JitsiMeetNW/)) {
290
     if (userAgent.match(/JitsiMeetNW/)) {
289
         currentBrowser = RTCBrowserType.RTC_BROWSER_NWJS;
291
         currentBrowser = RTCBrowserType.RTC_BROWSER_NWJS;
308
             name = match[1];
310
             name = match[1];
309
             version = match[2];
311
             version = match[2];
310
         }
312
         }
311
-        if (!name) {
312
-            name = 'react-native';
313
-        }
314
-        if (!version) {
315
-            version = 'unknown';
316
-        }
313
+        name || (name = 'react-native');
314
+        version || (version = 'unknown');
317
         console.info('This appears to be ' + name + ', ver: ' + version);
315
         console.info('This appears to be ' + name + ', ver: ' + version);
318
     } else {
316
     } else {
319
         // We're not running in a React Native environment.
317
         // We're not running in a React Native environment.

Laddar…
Avbryt
Spara