瀏覽代碼

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,20 +256,12 @@ const ScreenObtainer = {
256 256
     obtainScreenOnFirefox(options, callback, errorCallback) {
257 257
         let extensionRequired = false;
258 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 265
             logger.log(
274 266
                 `Jidesha extension required on firefox version ${
275 267
                     browser.getVersion()}`);

+ 1
- 1
package-lock.json 查看文件

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

+ 1
- 1
package.json 查看文件

@@ -19,7 +19,7 @@
19 19
     "async": "0.9.0",
20 20
     "current-executing-script": "0.1.3",
21 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 23
     "react-native-callstats": "3.27.0",
24 24
     "sdp-interop": "0.1.12",
25 25
     "sdp-simulcast": "0.2.1",

Loading…
取消
儲存