瀏覽代碼

Merge pull request #7938 from jitsi/tavram/twa

Tavram/twa
master
Avram Tudor 5 年之前
父節點
當前提交
8c67f1fdf3
No account linked to committer's email address
共有 3 個文件被更改,包括 4 次插入3 次删除
  1. 2
    2
      package-lock.json
  2. 1
    1
      package.json
  3. 1
    0
      react/features/chrome-extension-banner/components/ChromeExtensionBanner.web.js

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

@@ -10824,8 +10824,8 @@
10824 10824
       }
10825 10825
     },
10826 10826
     "lib-jitsi-meet": {
10827
-      "version": "github:jitsi/lib-jitsi-meet#4980889b24716c383311aadd760d958f6ff58277",
10828
-      "from": "github:jitsi/lib-jitsi-meet#4980889b24716c383311aadd760d958f6ff58277",
10827
+      "version": "github:jitsi/lib-jitsi-meet#de57cdfb6f2ac422901ade3cf0b4e130144c45ca",
10828
+      "from": "github:jitsi/lib-jitsi-meet#de57cdfb6f2ac422901ade3cf0b4e130144c45ca",
10829 10829
       "requires": {
10830 10830
         "@jitsi/js-utils": "1.0.2",
10831 10831
         "@jitsi/sdp-interop": "1.0.3",

+ 1
- 1
package.json 查看文件

@@ -56,7 +56,7 @@
56 56
     "jquery-i18next": "1.2.1",
57 57
     "js-md5": "0.6.1",
58 58
     "jwt-decode": "2.2.0",
59
-    "lib-jitsi-meet": "github:jitsi/lib-jitsi-meet#4980889b24716c383311aadd760d958f6ff58277",
59
+    "lib-jitsi-meet": "github:jitsi/lib-jitsi-meet#de57cdfb6f2ac422901ade3cf0b4e130144c45ca",
60 60
     "libflacjs": "github:mmig/libflac.js#93d37e7f811f01cf7d8b6a603e38bd3c3810907d",
61 61
     "lodash": "4.17.19",
62 62
     "moment": "2.19.4",

+ 1
- 0
react/features/chrome-extension-banner/components/ChromeExtensionBanner.web.js 查看文件

@@ -152,6 +152,7 @@ class ChromeExtensionBanner extends PureComponent<Props, State> {
152 152
     _isSupportedEnvironment() {
153 153
         return interfaceConfig.SHOW_CHROME_EXTENSION_BANNER
154 154
             && browser.isChrome()
155
+            && !browser.isTwa()
155 156
             && !isMobileBrowser()
156 157
             && !this.props.isVpaas;
157 158
     }

Loading…
取消
儲存