OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge commit '9a0ea56' into rav/roomview_works 

Conflicts:
	src/components/structures/RoomView.js
pull/21833/head
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/components/structures/MessagePanel.js
View File

@ -47,11 +47,6 @@ module.exports = React.createClass({
// for more details.
stickyBottom: React.PropTypes.bool,
// 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,
@ -140,13 +135,6 @@ module.exports = React.createClass({
continue;
}
if (this.props.isConferenceUser && mxEv.getType() === "m.room.member") {
if (this.props.isConferenceUser(mxEv.getSender()) ||
this.props.isConferenceUser(mxEv.getStateKey())) {
continue; // suppress conf user join/parts
}
}
break;
}
var lastShownEventIndex = i;
@ -167,13 +155,6 @@ module.exports = React.createClass({
wantTile = false;
}
if (this.props.isConferenceUser && mxEv.getType() === "m.room.member") {
if (this.props.isConferenceUser(mxEv.getSender()) ||
this.props.isConferenceUser(mxEv.getStateKey())) {
wantTile = false; // suppress conf user join/parts
}
}
var last = (i == lastShownEventIndex);
if (wantTile) {

3
src/components/structures/RoomView.js
View File

@ -1265,9 +1265,6 @@ module.exports = React.createClass({
highlightedEventId={this.props.highlightedEventId}
eventId={this.props.eventId}
eventPixelOffset={this.props.eventPixelOffset}
isConferenceUser={this.props.ConferenceHandler ?
this.props.ConferenceHandler.isConferenceUser :
null }
onScroll={ this.onMessageListScroll }
/>);

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 }
/>