Преглед на файлове

Merge branch 'better_react_native_detection' of https://github.com/tsareg/lib-jitsi-meet into tsareg-better_react_native_detection

dev1
Lyubomir Marinov преди 9 години
родител
ревизия
d6d0f2e386
променени са 1 файла, в които са добавени 9 реда и са изтрити 3 реда
  1. 9
    3
      modules/RTC/RTCBrowserType.js

+ 9
- 3
modules/RTC/RTCBrowserType.js Целия файл

222
     var match
222
     var match
223
         = navigator.userAgent.match(/\b(react[ \t_-]*native)(?:\/(\S+))?/i);
223
         = navigator.userAgent.match(/\b(react[ \t_-]*native)(?:\/(\S+))?/i);
224
     var version;
224
     var version;
225
-    if (match) {
225
+    // If we're debugging React-Native app, it may be treated as Chrome, which
226
+    // leads to some bugs.
227
+    // So we need to check navigator.product and always return some version
228
+    // even if can't get the real one.
229
+    if (match || navigator.product === "ReactNative") {
226
         currentBrowser = RTCBrowserType.RTC_BROWSER_REACT_NATIVE;
230
         currentBrowser = RTCBrowserType.RTC_BROWSER_REACT_NATIVE;
227
-        if (match.length > 2) {
231
+        if (match && match[2]) {
228
             version = match[2];
232
             version = match[2];
233
+        } else {
234
+            version = "react_native";
229
         }
235
         }
230
         console.info(
236
         console.info(
231
-            "This appears to be " + /* name */ match[1] + ", ver: " + version);
237
+            "This appears to be React-Native, ver: " + version);
232
     }
238
     }
233
     return version;
239
     return version;
234
 }
240
 }

Loading…
Отказ
Запис