matrix/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2025-11-29 21:23:11 +03:00
Code Activity

Merge commit '9a0ea56' into rav/roomview_works

Browse Source 
Conflicts:
	src/components/structures/RoomView.js
This commit is contained in:
Richard van der Hoff
2016-02-23 13:02:02 +00:00
parent b1093f3f4b 9a0ea56bba
commit 776b6a26c3
3 changed files with 0 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/components/structures/TimelinePanel.js
View File

@@ -67,11 +67,6 @@ module.exports = React.createClass({
// middle of the viewprt.
eventPixelOffset: React.PropTypes.number,
// callback to determine if a user is the magic freeswitch conference
// user. Takes one parameter, which is a user id. Should return true if
// the user is the conference user.
isConferenceUser: React.PropTypes.func,
// callback which is called when the panel is scrolled.
onScroll: React.PropTypes.func,
},
@@ -455,7 +450,6 @@ module.exports = React.createClass({
suppressFirstDateSeparator={ this.state.canBackPaginate }
ourUserId={ MatrixClientPeg.get().credentials.userId }
stickyBottom={ stickyBottom }
isConferenceUser={ this.props.isConferenceUser }
onScroll={ this.props.onScroll }
onFillRequest={ this.onMessageListFillRequest }
/>