소스 검색

ref(SS_FF): Revert desktopSharingFirefoxMaxVersionExtRequired conversion

dev1
hristoterezov 7 년 전
부모
커밋
d5389ace55
3개의 변경된 파일7개의 추가작업 그리고 15개의 파일을 삭제
  1. 5
    13
      modules/RTC/ScreenObtainer.js
  2. 1
    1
      package-lock.json
  3. 1
    1
      package.json

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

256
     obtainScreenOnFirefox(options, callback, errorCallback) {
256
     obtainScreenOnFirefox(options, callback, errorCallback) {
257
         let extensionRequired = false;
257
         let extensionRequired = false;
258
         const { desktopSharingFirefoxMaxVersionExtRequired } = this.options;
258
         const { desktopSharingFirefoxMaxVersionExtRequired } = this.options;
259
-        let maxVersion = desktopSharingFirefoxMaxVersionExtRequired;
260
 
259
 
261
-        if (typeof maxVersion === 'number') {
262
-            extensionRequired = maxVersion === -1;
263
-            if (maxVersion >= 0) {
264
-                maxVersion = String(maxVersion);
265
-            }
266
-        }
267
-
268
-        if (typeof maxVersion === 'string') {
269
-            extensionRequired = !browser.isVersionGreaterThan(maxVersion);
270
-        }
271
-
272
-        if (extensionRequired) {
260
+        if (desktopSharingFirefoxMaxVersionExtRequired === -1
261
+            || (desktopSharingFirefoxMaxVersionExtRequired >= 0
262
+            && !browser.isVersionGreaterThan(
263
+                desktopSharingFirefoxMaxVersionExtRequired))) {
264
+            extensionRequired = true;
273
             logger.log(
265
             logger.log(
274
                 `Jidesha extension required on firefox version ${
266
                 `Jidesha extension required on firefox version ${
275
                     browser.getVersion()}`);
267
                     browser.getVersion()}`);

+ 1
- 1
package-lock.json 파일 보기

4017
       "dev": true
4017
       "dev": true
4018
     },
4018
     },
4019
     "js-utils": {
4019
     "js-utils": {
4020
-      "version": "github:jitsi/js-utils#fa6eb93d1792b75e25bf84b97e51672e70d900de",
4020
+      "version": "github:jitsi/js-utils#d4b78721b754a15c2588b7b0c621a9fff6fa1363",
4021
       "requires": {
4021
       "requires": {
4022
         "bowser": "1.9.1"
4022
         "bowser": "1.9.1"
4023
       }
4023
       }

+ 1
- 1
package.json 파일 보기

19
     "async": "0.9.0",
19
     "async": "0.9.0",
20
     "current-executing-script": "0.1.3",
20
     "current-executing-script": "0.1.3",
21
     "jitsi-meet-logger": "github:jitsi/jitsi-meet-logger#6fff754a77a56ab52499f3559105a15886942a1e",
21
     "jitsi-meet-logger": "github:jitsi/jitsi-meet-logger#6fff754a77a56ab52499f3559105a15886942a1e",
22
-    "js-utils": "github:jitsi/js-utils#fa6eb93d1792b75e25bf84b97e51672e70d900de",
22
+    "js-utils": "github:jitsi/js-utils#d4b78721b754a15c2588b7b0c621a9fff6fa1363",
23
     "react-native-callstats": "3.27.0",
23
     "react-native-callstats": "3.27.0",
24
     "sdp-interop": "0.1.12",
24
     "sdp-interop": "0.1.12",
25
     "sdp-simulcast": "0.2.1",
25
     "sdp-simulcast": "0.2.1",

Loading…
취소
저장