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

missed a bit

Browse Source
This commit is contained in:
Half-Shot
2025-09-19 16:55:02 +01:00
parent 7ddef09ee7
commit bf33b27f53
2 changed files with 0 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/UrlParams.ts
View File

@@ -333,10 +333,7 @@ let urlParamCache: {
hash?: string; hash?: string;
params?: UrlParams; params?: UrlParams;
} = {}; } = {};
<<<<<<< HEAD
=======
>>>>>>> origin/livekit
/** /**
* Gets the url params and loads them from a cache if already computed. * Gets the url params and loads them from a cache if already computed.
* @param search The URL search string * @param search The URL search string
@@ -546,11 +543,7 @@ export const computeUrlParams = (search = "", hash = ""): UrlParams => {
intentAndPlatformDerivedConfiguration, intentAndPlatformDerivedConfiguration,
); );
<<<<<<< HEAD
const params = { const params = {
=======
return {
>>>>>>> origin/livekit
...properties, ...properties,
...intentPreset, ...intentPreset,
...pickBy(configuration, (v?: unknown) => v !== undefined), ...pickBy(configuration, (v?: unknown) => v !== undefined),

4
src/state/CallViewModel.ts
View File

@@ -1693,11 +1693,7 @@ export class CallViewModel extends ViewModel {
private readonly livekitRoom: LivekitRoom, private readonly livekitRoom: LivekitRoom,
private readonly mediaDevices: MediaDevices, private readonly mediaDevices: MediaDevices,
private readonly options: CallViewModelOptions, private readonly options: CallViewModelOptions,
<<<<<<< HEAD
public readonly livekitConnectionState$: Observable<ECConnectionState>,
=======
public readonly livekitConnectionState$: Behavior<ECConnectionState>, public readonly livekitConnectionState$: Behavior<ECConnectionState>,
>>>>>>> origin/livekit
private readonly handsRaisedSubject$: Observable< private readonly handsRaisedSubject$: Observable<
Record<string, RaisedHandInfo> Record<string, RaisedHandInfo>
>, >,