Matrix/element-call-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-call.git synced 2026-08-29 21:15:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix merge fails

Browse Source
This commit is contained in:
Half-Shot
2025-09-25 12:06:19 +01:00
parent 8d2c466e74
commit 717fd0aa3f
1 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/UrlParams.ts
View File

@@ -343,8 +343,6 @@ let urlParamCache: {
export const getUrlParams = ( export const getUrlParams = (
search = window.location.search, search = window.location.search,
hash = window.location.hash, hash = window.location.hash,
/** Skipping the cache might be needed in tests, to allow recomputing based on mocked platform changes. */
skipCache = false,
): UrlParams => { ): UrlParams => {
if ( if (
urlParamCache.search === search && urlParamCache.search === search &&
@@ -543,15 +541,12 @@ export const computeUrlParams = (search = "", hash = ""): UrlParams => {
intentAndPlatformDerivedConfiguration, intentAndPlatformDerivedConfiguration,
); );
const params = { return {
...properties, ...properties,
...intentPreset, ...intentPreset,
...pickBy(configuration, (v?: unknown) => v !== undefined), ...pickBy(configuration, (v?: unknown) => v !== undefined),
...intentAndPlatformDerivedConfiguration, ...intentAndPlatformDerivedConfiguration,
}; };
urlParamCache = { search, hash, params };
return params;
}; };
/** /**