OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Style fixes 

Signed-off-by: Pauli Virtanen <pav@iki.fi>
pull/21833/head
Pauli Virtanen 2020-04-28 02:18:43 +03:00
parent 798f5d401b
commit 38962560ac
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/components/views/elements/AppTile.js
View File

@ -39,6 +39,7 @@ import SettingsStore, {SettingLevel} from "../../../settings/SettingsStore";
import {aboveLeftOf, ContextMenu, ContextMenuButton} from "../../structures/ContextMenu"; import {aboveLeftOf, ContextMenu, ContextMenuButton} from "../../structures/ContextMenu";
import PersistedElement from "./PersistedElement"; import PersistedElement from "./PersistedElement";
import {WidgetType} from "../../../widgets/WidgetType"; import {WidgetType} from "../../../widgets/WidgetType";
import {Capability} from "../../../widgets/WidgetApi";
import {sleep} from "../../../utils/promise"; import {sleep} from "../../../utils/promise";
const ALLOWED_APP_URL_SCHEMES = ['https:', 'http:']; const ALLOWED_APP_URL_SCHEMES = ['https:', 'http:'];
@ -344,18 +345,18 @@ export default class AppTile extends React.Component {
* @returns {Promise<*>} Resolves when the widget is terminated, or timeout passed. * @returns {Promise<*>} Resolves when the widget is terminated, or timeout passed.
*/ */
_endWidgetActions() { _endWidgetActions() {
let promise; let terminationPromise;
if (this._hasCapability('im.vector.receive_terminate')) { if (this._hasCapability(Capability.ReceiveTerminate)) {
// Wait for widget to terminate within a timeout // Wait for widget to terminate within a timeout
const timeout = 2000; const timeout = 2000;
const messaging = ActiveWidgetStore.getWidgetMessaging(this.props.app.id); const messaging = ActiveWidgetStore.getWidgetMessaging(this.props.app.id);
promise = Promise.race([messaging.terminate(), sleep(timeout)]); terminationPromise = Promise.race([messaging.terminate(), sleep(timeout)]);
} else { } else {
promise = Promise.resolve(); terminationPromise = Promise.resolve();
} }
return promise.finally(() => { return terminationPromise.finally(() => {
// HACK: This is a really dirty way to ensure that Jitsi cleans up // HACK: This is a really dirty way to ensure that Jitsi cleans up
// its hold on the webcam. Without this, the widget holds a media // its hold on the webcam. Without this, the widget holds a media
// stream open, even after death. See https://github.com/vector-im/riot-web/issues/7351 // stream open, even after death. See https://github.com/vector-im/riot-web/issues/7351

5
src/widgets/WidgetApi.ts
View File

@ -111,11 +111,12 @@ export class WidgetApi extends EventEmitter {
} else if (payload.action === KnownWidgetActions.Terminate) { } else if (payload.action === KnownWidgetActions.Terminate) {
// Finalization needs to be async, so postpone with a promise // Finalization needs to be async, so postpone with a promise
let finalizePromise = Promise.resolve(); let finalizePromise = Promise.resolve();
const wait = promise => { const wait = (promise) => {
finalizePromise = finalizePromise.then(value => promise); finalizePromise = finalizePromise.then(value => promise);
} };
this.emit('terminate', wait); this.emit('terminate', wait);
Promise.resolve(finalizePromise).then(() => { Promise.resolve(finalizePromise).then(() => {
// Acknowledge that we're shut down now
this.replyToRequest(<ToWidgetRequest>payload, {}); this.replyToRequest(<ToWidgetRequest>payload, {});
}); });
} else { } else {