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

Simplify event name as it's the only one

pull/21833/head
David Baker 2018-07-05 20:00:42 +01:00
parent 3f20eb9610
commit b6f854abe4
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/structures/RoomView.js
View File

@ -155,7 +155,7 @@ module.exports = React.createClass({
this._roomStoreToken = RoomViewStore.addListener(this._onRoomViewStoreUpdate); this._roomStoreToken = RoomViewStore.addListener(this._onRoomViewStoreUpdate);
this._onRoomViewStoreUpdate(true); this._onRoomViewStoreUpdate(true);
WidgetEchoStore.on('updateRoomWidgetEcho', this._onWidgetEchoStoreUpdate); WidgetEchoStore.on('update', this._onWidgetEchoStoreUpdate);
}, },
_onRoomViewStoreUpdate: function(initial) { _onRoomViewStoreUpdate: function(initial) {
@ -425,7 +425,7 @@ module.exports = React.createClass({
this._roomStoreToken.remove(); this._roomStoreToken.remove();
} }
WidgetEchoStore.removeListener('updateRoomWidgetEcho', this._onWidgetEchoStoreUpdate); WidgetEchoStore.removeListener('update', this._onWidgetEchoStoreUpdate);
// cancel any pending calls to the rate_limited_funcs // cancel any pending calls to the rate_limited_funcs
this._updateRoomMembers.cancelPendingCall(); this._updateRoomMembers.cancelPendingCall();

4
src/components/views/rooms/AppsDrawer.js
View File

@ -58,7 +58,7 @@ module.exports = React.createClass({
componentWillMount: function() { componentWillMount: function() {
ScalarMessaging.startListening(); ScalarMessaging.startListening();
MatrixClientPeg.get().on('RoomState.events', this.onRoomStateEvents); MatrixClientPeg.get().on('RoomState.events', this.onRoomStateEvents);
WidgetEchoStore.on('updateRoomWidgetEcho', this._updateApps); WidgetEchoStore.on('update', this._updateApps);
}, },
componentDidMount: function() { componentDidMount: function() {
@ -84,7 +84,7 @@ module.exports = React.createClass({
if (MatrixClientPeg.get()) { if (MatrixClientPeg.get()) {
MatrixClientPeg.get().removeListener('RoomState.events', this.onRoomStateEvents); MatrixClientPeg.get().removeListener('RoomState.events', this.onRoomStateEvents);
} }
WidgetEchoStore.removeListener('updateRoomWidgetEcho', this._updateApps); WidgetEchoStore.removeListener('update', this._updateApps);
dis.unregister(this.dispatcherRef); dis.unregister(this.dispatcherRef);
}, },

4
src/stores/WidgetEchoStore.js
View File

@ -91,13 +91,13 @@ class WidgetEchoStore extends EventEmitter {
if (this._roomWidgetEcho[roomId] === undefined) this._roomWidgetEcho[roomId] = {}; if (this._roomWidgetEcho[roomId] === undefined) this._roomWidgetEcho[roomId] = {};
this._roomWidgetEcho[roomId][widgetId] = state; this._roomWidgetEcho[roomId][widgetId] = state;
this.emit('updateRoomWidgetEcho'); this.emit('update');
} }
removeRoomWidgetEcho(roomId, widgetId) { removeRoomWidgetEcho(roomId, widgetId) {
delete this._roomWidgetEcho[roomId][widgetId]; delete this._roomWidgetEcho[roomId][widgetId];
if (Object.keys(this._roomWidgetEcho[roomId]).length === 0) delete this._roomWidgetEcho[roomId]; if (Object.keys(this._roomWidgetEcho[roomId]).length === 0) delete this._roomWidgetEcho[roomId];
this.emit('updateRoomWidgetEcho'); this.emit('update');
} }
} }