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

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

Browse source
This commit is contained in:
Richard van der Hoff 2016-02-03 14:09:50 +00:00
commit 2479c81cf6
7 changed files with 66 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -933,7 +933,7 @@ module.exports = React.createClass({
var hr;
hr = (<hr className="mx_RoomView_myReadMarker" style={{opacity: 1, width: '99%'}} ref={function(n) {
Velocity(n, {opacity: '0', width: '10%'}, {duration: 400, easing: 'easeInSine', delay: 1000, complete: function() {
self.setState({readMarkerGhostEventId: undefined});
if (!self.unmounted) self.setState({readMarkerGhostEventId: undefined});
}});
}} />);
ret.splice(ghostIndex, 0, (