xmj/element-call
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/main' into dbkr/otel

Browse source
This commit is contained in:
David Baker 2023-03-29 12:30:41 +01:00
commit 34a72679a1
4 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.github/workflows/publish.yaml vendored
View file

@ -40,6 +40,9 @@ jobs:
SENTRY_URL: ${{ secrets.SENTRY_URL }} SENTRY_URL: ${{ secrets.SENTRY_URL }}
SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }} SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
VITE_APP_VERSION: ${{ github.event.release.tag_name }} VITE_APP_VERSION: ${{ github.event.release.tag_name }}
# This appears to be necessary to stop Vite from OOMing
# https://github.com/vitejs/vite/issues/2433
NODE_OPTIONS: "--max-old-space-size=16384"
- name: Create Tarball - name: Create Tarball
env: env:

2
package.json
View file

@ -54,7 +54,7 @@
"i18next-http-backend": "^1.4.4", "i18next-http-backend": "^1.4.4",
"lodash": "^4.17.21", "lodash": "^4.17.21",
"matrix-js-sdk": "github:matrix-org/matrix-js-sdk#042f2ed76c501c10dde98a31732fd92d862e2187", "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#042f2ed76c501c10dde98a31732fd92d862e2187",
"matrix-widget-api": "^1.0.0", "matrix-widget-api": "^1.3.1",
"mermaid": "^8.13.8", "mermaid": "^8.13.8",
"normalize.css": "^8.0.1", "normalize.css": "^8.0.1",
"pako": "^2.0.4", "pako": "^2.0.4",

4
src/room/useGroupCall.ts
View file

@ -216,7 +216,7 @@ export function useGroupCall(
]; ];
for (const mediaAction of mediaActions) { for (const mediaAction of mediaActions) {
navigator.mediaSession.setActionHandler( navigator.mediaSession?.setActionHandler(
mediaAction, mediaAction,
doNothingMediaActionCallback doNothingMediaActionCallback
); );
@ -224,7 +224,7 @@ export function useGroupCall(
return () => { return () => {
for (const mediaAction of mediaActions) { for (const mediaAction of mediaActions) {
navigator.mediaSession.setActionHandler(mediaAction, null); navigator.mediaSession?.setActionHandler(mediaAction, null);
} }
}; };
}, [doNothingMediaActionCallback]); }, [doNothingMediaActionCallback]);

8
yarn.lock
View file

@ -10562,10 +10562,10 @@ matrix-events-sdk@0.0.1:
unhomoglyph "^1.0.6" unhomoglyph "^1.0.6"
uuid "9" uuid "9"
matrix-widget-api@^1.0.0: matrix-widget-api@^1.3.1:
version "1.1.1" version "1.3.1"
resolved "https://registry.yarnpkg.com/matrix-widget-api/-/matrix-widget-api-1.1.1.tgz#d3fec45033d0cbc14387a38ba92dac4dbb1be962" resolved "https://registry.yarnpkg.com/matrix-widget-api/-/matrix-widget-api-1.3.1.tgz#e38f404c76bb15c113909505c1c1a5b4d781c2f5"
integrity sha512-gNSgmgSwvOsOcWK9k2+tOhEMYBiIMwX95vMZu0JqY7apkM02xrOzUBuPRProzN8CnbIALH7e3GAhatF6QCNvtA== integrity sha512-+rN6vGvnXm+fn0uq9r2KWSL/aPtehD6ObC50jYmUcEfgo8CUpf9eUurmjbRlwZkWq3XHXFuKQBUCI9UzqWg37Q==
dependencies: dependencies:
"@types/events" "^3.0.0" "@types/events" "^3.0.0"
events "^3.2.0" events "^3.2.0"