Skip to content

Commit 80c2bd0

Browse files
committed
Remove bouncing, set animation time to be constant (prevents temporary overalpping) and exclude ourselves.
1 parent e23b90a commit 80c2bd0

File tree

2 files changed

+5
-21
lines changed

2 files changed

+5
-21
lines changed

src/VelocityBounce.js

Lines changed: 0 additions & 15 deletions
This file was deleted.

src/skins/vector/views/molecules/EventTile.js

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ var ContextualMenu = require('../../../../ContextualMenu');
2929
var TextForEvent = require('matrix-react-sdk/lib/TextForEvent');
3030

3131
var Velociraptor = require('../../../../Velociraptor');
32-
require('../../../../VelocityBounce');
3332

3433
var eventTileTypes = {
3534
'm.room.message': 'molecules.MessageTile',
@@ -90,9 +89,11 @@ module.exports = React.createClass({
9089

9190
if (!room) return [];
9291

92+
var myUserId = MatrixClientPeg.get().credentials.userId;
93+
9394
// get list of read receipts, sorted most recent first
9495
var receipts = room.getReceiptsForEvent(this.props.mxEvent).filter(function(r) {
95-
return r.type === "m.read";
96+
return r.type === "m.read" && r.userId != myUserId;
9697
}).sort(function(r1, r2) {
9798
return r2.data.ts - r1.data.ts;
9899
});
@@ -130,10 +131,8 @@ module.exports = React.createClass({
130131
// and then it will drop down to its resting position
131132
startStyles.push({ top: topOffset, left: '0px' });
132133
enterTransitionOpts.push({
133-
// Sort of make it take a bit longer to fall in a way
134-
// that would make my A level physics teacher cry.
135-
duration: Math.min(Math.log(Math.abs(topOffset)) * 200, 3000),
136-
easing: 'easeOutBounce'
134+
duration: 300,
135+
easing: 'easeOutCubic',
137136
});
138137
}
139138

0 commit comments

Comments
 (0)