mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-10-25 12:16:00 +03:00
Code Issues Projects Releases Packages 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')) { if (WidgetEchoStore.roomHasPendingWidgetsOfType(roomId, currentRoomWidgets, 'jitsi')) {
const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog"); const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
Modal.createTrackedDialog('Call being placed', '', ErrorDialog, { Modal.createTrackedDialog('Call already in progress', '', ErrorDialog, {
title: _t('Call in Progress'), title: _t('Call in Progress'),
description: _t('A call is currently being placed!'), 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) { for (const w of currentRoomWidgets) {
const widgetId = w.getStateKey(); const widgetId = w.getStateKey();
// If there's no echo, or the echo still has a widget present, show the *old* widget // 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) { if (!roomEchoState[widgetId] || Object.keys(roomEchoState[widgetId]).length !== 0) {
} else {
echoedWidgets.push(w); echoedWidgets.push(w);
} }
delete roomEchoState[widgetId]; delete roomEchoState[widgetId];

2
src/utils/WidgetUtils.js
View file

@ -22,7 +22,7 @@ import * as url from "url";
import WidgetEchoStore from '../stores/WidgetEchoStore'; import WidgetEchoStore from '../stores/WidgetEchoStore';
// How long we wait for the state event echo to come back from the server // 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; const WIDGET_WAIT_TIME = 20000;
export default class WidgetUtils { export default class WidgetUtils {