Merge remote-tracking branch 'origin/develop' into develop

2018-05-27 16:50:27 +00:00 · 2018-05-27 16:50:27 +00:00 · ffe9a6f4f9
parent 7da4201ed1 96ec3ab78a
commit ffe9a6f4f9
1 changed files with 13 additions and 0 deletions
--- a/src/components/views/rooms/PinnedEventsPanel.js
+++ b/src/components/views/rooms/PinnedEventsPanel.js
@ -39,6 +39,19 @@ module.exports = React.createClass({

    componentDidMount: function() {
        this._updatePinnedMessages();
+        MatrixClientPeg.get().on("RoomState.events", this._onStateEvent);
+    },
+
+    componentWillUnmount: function() {
+        if (MatrixClientPeg.get()) {
+            MatrixClientPeg.get().removeListener("RoomState.events", this._onStateEvent);
+        }
+    },
+
+    _onStateEvent: function(ev) {
+        if (ev.getRoomId() === this.props.room.roomId && ev.getType() === "m.room.pinned_events") {
+            this._updatePinnedMessages();
+        }
    },

    _updatePinnedMessages: function() {