From 80c2bd0c7f8b17e2ceb58c028d247c14d8a1b0dc Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 17 Nov 2015 15:51:00 +0000
Subject: [PATCH] Remove bouncing, set animation time to be constant (prevents
 temporary overalpping) and exclude ourselves.

---
 src/VelocityBounce.js                         | 15 ---------------
 src/skins/vector/views/molecules/EventTile.js | 11 +++++------
 2 files changed, 5 insertions(+), 21 deletions(-)
 delete mode 100644 src/VelocityBounce.js

diff --git a/src/VelocityBounce.js b/src/VelocityBounce.js
deleted file mode 100644
index c85aa254fa..0000000000
--- a/src/VelocityBounce.js
+++ /dev/null
@@ -1,15 +0,0 @@
-var Velocity = require('velocity-animate');
-
-// courtesy of https://github.com/julianshapiro/velocity/issues/283
-// We only use easeOutBounce (easeInBounce is just sort of nonsensical)
-function bounce( p ) {
-    var pow2,
-        bounce = 4;
-
-    while ( p < ( ( pow2 = Math.pow( 2, --bounce ) ) - 1 ) / 11 ) {}
-    return 1 / Math.pow( 4, 3 - bounce ) - 7.5625 * Math.pow( ( pow2 * 3 - 2 ) / 22 - p, 2 );
-}
-
-Velocity.Easings.easeOutBounce = function(p) {
-    return 1 - bounce(1 - p);
-}
diff --git a/src/skins/vector/views/molecules/EventTile.js b/src/skins/vector/views/molecules/EventTile.js
index 068397be65..39722c7c68 100644
--- a/src/skins/vector/views/molecules/EventTile.js
+++ b/src/skins/vector/views/molecules/EventTile.js
@@ -29,7 +29,6 @@ var ContextualMenu = require('../../../../ContextualMenu');
 var TextForEvent = require('matrix-react-sdk/lib/TextForEvent');
 
 var Velociraptor = require('../../../../Velociraptor');
-require('../../../../VelocityBounce');
 
 var eventTileTypes = {
     'm.room.message': 'molecules.MessageTile',
@@ -90,9 +89,11 @@ module.exports = React.createClass({
 
         if (!room) return [];
 
+        var myUserId = MatrixClientPeg.get().credentials.userId;
+
         // get list of read receipts, sorted most recent first
         var receipts = room.getReceiptsForEvent(this.props.mxEvent).filter(function(r) {
-            return r.type === "m.read";
+            return r.type === "m.read" && r.userId != myUserId;
         }).sort(function(r1, r2) {
             return r2.data.ts - r1.data.ts;
         });
@@ -130,10 +131,8 @@ module.exports = React.createClass({
                 // and then it will drop down to its resting position
                 startStyles.push({ top: topOffset, left: '0px' });
                 enterTransitionOpts.push({
-                    // Sort of make it take a bit longer to fall in a way
-                    // that would make my A level physics teacher cry.
-                    duration: Math.min(Math.log(Math.abs(topOffset)) * 200, 3000),
-                    easing: 'easeOutBounce'
+                    duration: 300,
+                    easing: 'easeOutCubic',
                 });
             }