From 0f32c3a01852f228607ed3b586020fd3dffc1a6d Mon Sep 17 00:00:00 2001 From: David Baker Date: Mon, 16 Jul 2018 13:18:10 +0100 Subject: [PATCH] PR feedback --- src/CallHandler.js | 2 +- src/stores/WidgetEchoStore.js | 4 ++-- src/utils/WidgetUtils.js | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/CallHandler.js b/src/CallHandler.js index d61ea93c02..a9c36c8af2 100644 --- a/src/CallHandler.js +++ b/src/CallHandler.js @@ -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!'), }); diff --git a/src/stores/WidgetEchoStore.js b/src/stores/WidgetEchoStore.js index f442baee6c..0d14ed1d60 100644 --- a/src/stores/WidgetEchoStore.js +++ b/src/stores/WidgetEchoStore.js @@ -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]; diff --git a/src/utils/WidgetUtils.js b/src/utils/WidgetUtils.js index cf12a64329..5d98e6f45c 100644 --- a/src/utils/WidgetUtils.js +++ b/src/utils/WidgetUtils.js @@ -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 {