Matrix-Mirrors/schildi-web
1
0
Fork 0
mirror of https://github.com/SchildiChat/element-web.git synced 2024-10-01 01:26:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix config.json failing to load for Jitsi wrapper in non-root deployment (#23577) (#23615)

Browse Source 
(cherry picked from commit a3ece528e5)

Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
This commit is contained in:
ElementRobot 2022-10-26 16:41:58 +01:00 committed by GitHub
parent 6eed898183
commit 446d944888
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
package.json
View File

@ -92,6 +92,7 @@
"@testing-library/react": "^12.1.5", "@testing-library/react": "^12.1.5",
"@types/flux": "^3.1.9", "@types/flux": "^3.1.9",
"@types/jest": "^29.0.0", "@types/jest": "^29.0.0",
"@types/jsrsasign": "^10.5.4",
"@types/modernizr": "^3.5.3", "@types/modernizr": "^3.5.3",
"@types/node": "^14.18.28", "@types/node": "^14.18.28",
"@types/react": "^17.0.49", "@types/react": "^17.0.49",

2
src/vector/jitsi/index.ts
View File

@ -65,7 +65,7 @@ const setupCompleted = (async () => {
try { try {
// Queue a config.json lookup asap, so we can use it later on. We want this to be concurrent with // Queue a config.json lookup asap, so we can use it later on. We want this to be concurrent with
// other setup work and therefore do not block. // other setup work and therefore do not block.
const configPromise = getVectorConfig('..'); const configPromise = getVectorConfig();
// The widget's options are encoded into the fragment to avoid leaking info to the server. // The widget's options are encoded into the fragment to avoid leaking info to the server.
const widgetQuery = new URLSearchParams(window.location.hash.substring(1)); const widgetQuery = new URLSearchParams(window.location.hash.substring(1));

7
yarn.lock
View File

@ -2062,6 +2062,11 @@
resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee" resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee"
integrity sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ== integrity sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==
"@types/jsrsasign@^10.5.4":
version "10.5.4"
resolved "https://registry.yarnpkg.com/@types/jsrsasign/-/jsrsasign-10.5.4.tgz#e8a147c70e017198fd161600e24c938af7b5ae2f"
integrity sha512-05S2f4lGaWgCwFHsa3OEirc4VJf/sJRfhofzxUbuFbmm6NbffPXZrnJqquQAtS3g4C8Z0L9NHgW0znmtDxNoTQ==
"@types/minimatch@*": "@types/minimatch@*":
version "3.0.5" version "3.0.5"
resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.5.tgz#1001cc5e6a3704b83c236027e77f2f58ea010f40" resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.5.tgz#1001cc5e6a3704b83c236027e77f2f58ea010f40"
@ -8172,6 +8177,7 @@ matrix-js-sdk@21.0.0:
dependencies: dependencies:
"@babel/runtime" "^7.12.5" "@babel/runtime" "^7.12.5"
another-json "^0.2.0" another-json "^0.2.0"
browser-request "^0.3.3"
bs58 "^5.0.0" bs58 "^5.0.0"
content-type "^1.0.4" content-type "^1.0.4"
loglevel "^1.7.1" loglevel "^1.7.1"
@ -8202,6 +8208,7 @@ matrix-react-sdk@3.59.0:
"@types/ua-parser-js" "^0.7.36" "@types/ua-parser-js" "^0.7.36"
await-lock "^2.1.0" await-lock "^2.1.0"
blurhash "^1.1.3" blurhash "^1.1.3"
browser-request "^0.3.3"
cheerio "^1.0.0-rc.9" cheerio "^1.0.0-rc.9"
classnames "^2.2.6" classnames "^2.2.6"
commonmark "^0.29.3" commonmark "^0.29.3"