PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Destroy non-persistent widgets when switching room

Browse source
This commit is contained in:
David Baker 2018-08-01 15:01:11 +01:00
parent 2f13615dd1
commit 7875d37c8e
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/components/views/elements/AppTile.js
View file

@ -161,6 +161,8 @@ export default class AppTile extends React.Component {
// if it's not remaining on screen, get rid of the PersistedElement container // if it's not remaining on screen, get rid of the PersistedElement container
if (!ActiveWidgetStore.getWidgetPersistence(this.props.id)) { if (!ActiveWidgetStore.getWidgetPersistence(this.props.id)) {
ActiveWidgetStore.destroyPersistentWidget(); ActiveWidgetStore.destroyPersistentWidget();
const PersistedElement = sdk.getComponent("elements.PersistedElement");
PersistedElement.destroyElement(this._persistKey);
} }
} }
@ -437,6 +439,7 @@ export default class AppTile extends React.Component {
// Force the widget to be non-persistent // Force the widget to be non-persistent
ActiveWidgetStore.destroyPersistentWidget(); ActiveWidgetStore.destroyPersistentWidget();
PersistedElement.destroyElement(this._persistKey);
} }
formatAppTileName() { formatAppTileName() {

2
src/stores/ActiveWidgetStore.js
View file

@ -75,8 +75,6 @@ class ActiveWidgetStore extends EventEmitter {
destroyPersistentWidget() { destroyPersistentWidget() {
const toDeleteId = this._persistentWidgetId; const toDeleteId = this._persistentWidgetId;
const PersistedElement = sdk.getComponent("elements.PersistedElement");
PersistedElement.destroyElement('widget_' + toDeleteId);
this.setWidgetPersistence(toDeleteId, false); this.setWidgetPersistence(toDeleteId, false);
this.delWidgetMessaging(toDeleteId); this.delWidgetMessaging(toDeleteId);
this.delWidgetCapabilities(toDeleteId); this.delWidgetCapabilities(toDeleteId);