mirror of https://github.com/vector-im/riot-web
Hotfix fix: `waitForEvent` does resolve immediatly. (#12201)
* New room header - add chat button during call - close lobby button in lobby - join button if session exists - allow to toggle call <-> timeline during call with call button Compound style for join button in call notify toast. Signed-off-by: Timo K <toger5@hotmail.de> * dont show start call, join button in video rooms. Signed-off-by: Timo K <toger5@hotmail.de> * Make active call check based on participant count Not based on available call object Signed-off-by: Timo K <toger5@hotmail.de> * fix room header tests Signed-off-by: Timo K <toger5@hotmail.de> * fix room header tests Signed-off-by: Timo K <toger5@hotmail.de> * remove chat button test for displaying. Chat button display logic is now part of the RoomHeader. Signed-off-by: Timo K <toger5@hotmail.de> * remove duplicate notification Tread icon Signed-off-by: Timo K <toger5@hotmail.de> * remove obsolete jest snapshot Signed-off-by: Timo K <toger5@hotmail.de> * Update src/components/views/rooms/RoomHeader.tsx Co-authored-by: Robin <robin@robin.town> * update isECWidget logic Signed-off-by: Timo K <toger5@hotmail.de> * remove dead code Signed-off-by: Timo K <toger5@hotmail.de> * refactor call options Add menu to choose if there are multiple options Signed-off-by: Timo K <toger5@hotmail.de> * join ec when clicking join button (dont start jitsi) Use icon buttons don't show call icon when join button is visible Signed-off-by: Timo K <toger5@hotmail.de> * refactor isViewingCall Signed-off-by: Timo K <toger5@hotmail.de> * fix room header tests Signed-off-by: Timo K <toger5@hotmail.de> * fix header snapshot Signed-off-by: Timo K <toger5@hotmail.de> * sonar proposals Signed-off-by: Timo K <toger5@hotmail.de> * fix event shiftKey may be undefined Signed-off-by: Timo K <toger5@hotmail.de> * more lobby time before timeout only await sticky promise on becoming sticky. Signed-off-by: Timo K <toger5@hotmail.de> * don't allow starting new calls if there is an ongoing other call. Signed-off-by: Timo K <toger5@hotmail.de> * review Signed-off-by: Timo K <toger5@hotmail.de> * fix translation typo Signed-off-by: Timo K <toger5@hotmail.de> * missing await in case customTimeout=false Signed-off-by: Timo K <toger5@hotmail.de> --------- Signed-off-by: Timo K <toger5@hotmail.de> Co-authored-by: Robin <robin@robin.town>pull/28217/head
parent
c6dddf813c
commit
01f0c668b7
|
@ -70,21 +70,18 @@ const waitForEvent = async (
|
|||
let listener: (...args: any[]) => void;
|
||||
const wait = new Promise<void>((resolve) => {
|
||||
listener = (...args) => {
|
||||
if (pred(...args)) {
|
||||
resolve();
|
||||
if (customTimeout === false) {
|
||||
emitter.off(event, listener!);
|
||||
}
|
||||
}
|
||||
if (pred(...args)) resolve();
|
||||
};
|
||||
emitter.on(event, listener);
|
||||
});
|
||||
|
||||
if (customTimeout !== false) {
|
||||
const timedOut = (await timeout(wait, false, customTimeout ?? TIMEOUT_MS)) === false;
|
||||
emitter.off(event, listener!);
|
||||
if (timedOut) throw new Error("Timed out");
|
||||
} else {
|
||||
await wait;
|
||||
}
|
||||
emitter.off(event, listener!);
|
||||
};
|
||||
|
||||
export enum ConnectionState {
|
||||
|
|
Loading…
Reference in New Issue