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

Merge pull request #734 from matrix-org/luke/fix-resend

Browse source 
Fix resend bar and "send anyway" in UDD
This commit is contained in:
David Baker 2017-03-06 11:06:52 +00:00 committed by GitHub
commit 30eddf9fda
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/Resend.js
View file

@ -18,18 +18,19 @@ var MatrixClientPeg = require('./MatrixClientPeg');
var dis = require('./dispatcher'); var dis = require('./dispatcher');
var sdk = require('./index'); var sdk = require('./index');
var Modal = require('./Modal'); var Modal = require('./Modal');
import { EventStatus } from 'matrix-js-sdk';
module.exports = { module.exports = {
resendUnsentEvents: function(room) { resendUnsentEvents: function(room) {
room.getPendingEvents().filter(function(ev) { room.getPendingEvents().filter(function(ev) {
return ev.status === Matrix.EventStatus.NOT_SENT; return ev.status === EventStatus.NOT_SENT;
}).forEach(function(event) { }).forEach(function(event) {
module.exports.resend(event); module.exports.resend(event);
}); });
}, },
cancelUnsentEvents: function(room) { cancelUnsentEvents: function(room) {
room.getPendingEvents().filter(function(ev) { room.getPendingEvents().filter(function(ev) {
return ev.status === Matrix.EventStatus.NOT_SENT; return ev.status === EventStatus.NOT_SENT;
}).forEach(function(event) { }).forEach(function(event) {
module.exports.removeFromQueue(event); module.exports.removeFromQueue(event);
}); });

1
src/components/views/dialogs/UnknownDeviceDialog.js
View file

@ -19,6 +19,7 @@ import sdk from '../../../index';
import dis from '../../../dispatcher'; import dis from '../../../dispatcher';
import MatrixClientPeg from '../../../MatrixClientPeg'; import MatrixClientPeg from '../../../MatrixClientPeg';
import GeminiScrollbar from 'react-gemini-scrollbar'; import GeminiScrollbar from 'react-gemini-scrollbar';
import Resend from '../../../Resend';
function DeviceListEntry(props) { function DeviceListEntry(props) {
const {userId, device} = props; const {userId, device} = props;