imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #231 from matrix-org/rav/pending_event_list

Browse source 
Use new pendingEventList functionality from matrix-js-sdk
This commit is contained in:
Richard van der Hoff 2016-03-18 16:17:56 +00:00
commit 15c9ad87a1
4 changed files with 26 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/components/structures/RoomView.js
View file

@ -216,11 +216,6 @@ module.exports = React.createClass({
this.setState({
hasUnsentMessages: this._hasUnsentMessages(this.state.room)
});
case 'message_resend_started':
this.setState({
room: MatrixClientPeg.get().getRoom(this.props.roomId)
});
this.forceUpdate();
break;
case 'notifier_enabled':
case 'upload_failed':
@ -400,9 +395,7 @@ module.exports = React.createClass({
_getUnsentMessages: function(room) {
if (!room) { return []; }
// TODO: It would be nice if the JS SDK provided nicer constant-time
// constructs rather than O(N) (N=num msgs) on this.
return room.timeline.filter(function(ev) {
return room.getPendingEvents().filter(function(ev) {
return ev.status === Matrix.EventStatus.NOT_SENT;
});
},