Matrix/element-web-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-web.git synced 2024-11-17 05:55:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

PR feedback

Browse Source
This commit is contained in:
David Baker 2018-07-16 13:18:10 +01:00
parent b6f854abe4
commit 0f32c3a018
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/CallHandler.js
View File

@ -419,7 +419,7 @@ function _startCallApp(roomId, type) {
if (WidgetEchoStore.roomHasPendingWidgetsOfType(roomId, currentRoomWidgets, 'jitsi')) {
const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
Modal.createTrackedDialog('Call being placed', '', ErrorDialog, {
Modal.createTrackedDialog('Call already in progress', '', ErrorDialog, {
title: _t('Call in Progress'),
description: _t('A call is currently being placed!'),
});

4
src/stores/WidgetEchoStore.js
View File

@ -52,9 +52,9 @@ class WidgetEchoStore extends EventEmitter {
for (const w of currentRoomWidgets) {
const widgetId = w.getStateKey();
// If there's no echo, or the echo still has a widget present, show the *old* widget
// we don't include widgets that have changed for the same rason we don't include new ones
// we don't include widgets that have changed for the same reason we don't include new ones,
// ie. we'd need to fake matrix events to do so and therte's currently no need.
if (!roomEchoState[widgetId] || Object.keys(roomEchoState[widgetId]).length !== 0) {
} else {
echoedWidgets.push(w);
}
delete roomEchoState[widgetId];

2
src/utils/WidgetUtils.js
View File

@ -22,7 +22,7 @@ import * as url from "url";
import WidgetEchoStore from '../stores/WidgetEchoStore';
// How long we wait for the state event echo to come back from the server
// before the promise is rejected
// before waitFor[Room/User]Widget rejects its promise
const WIDGET_WAIT_TIME = 20000;
export default class WidgetUtils {