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

Merge branch 'rav/timeline_window' into rav/link_to_event

Browse source 
Conflicts:
	src/components/structures/MatrixChat.js
	src/components/structures/ScrollPanel.js
This commit is contained in:
Richard van der Hoff 2016-02-03 14:12:28 +00:00
commit e01d61dfeb
6 changed files with 64 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1017,7 +1017,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, (