PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Fix review comments

Browse source 
camelcasing and comments
This commit is contained in:
Richard van der Hoff 2015-12-10 21:44:30 +00:00
parent 1a3fb9aca9
commit d9782b35e1
2 changed files with 17 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/components/structures/MatrixChat.js
View file

@ -324,18 +324,18 @@ module.exports = React.createClass({
this.setState(newState); this.setState(newState);
if (this.scrollStateMap[roomId]) { if (this.scrollStateMap[roomId]) {
var scrollState = this.scrollStateMap[roomId]; var scrollState = this.scrollStateMap[roomId];
this.refs.roomview.restoreScrollState(scrollState); this.refs.roomView.restoreScrollState(scrollState);
} }
}, },
// update scrollStateMap according to the current scroll state of the // update scrollStateMap according to the current scroll state of the
// room view. // room view.
_updateScrollMap: function() { _updateScrollMap: function() {
if (!this.refs.roomview) { if (!this.refs.roomView) {
return; return;
} }
var roomview = this.refs.roomview; var roomview = this.refs.roomView;
var state = roomview.getScrollState(); var state = roomview.getScrollState();
this.scrollStateMap[roomview.props.roomId] = state; this.scrollStateMap[roomview.props.roomId] = state;
}, },
@ -608,7 +608,7 @@ module.exports = React.createClass({
case this.PageTypes.RoomView: case this.PageTypes.RoomView:
page_element = ( page_element = (
<RoomView <RoomView
ref="roomview" ref="roomView"
roomId={this.state.currentRoom} roomId={this.state.currentRoom}
key={this.state.currentRoom} key={this.state.currentRoom}
ConferenceHandler={this.props.ConferenceHandler} /> ConferenceHandler={this.props.ConferenceHandler} />

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

@ -802,14 +802,14 @@ module.exports = React.createClass({
// //
// pixel_offset gives the number of pixels between the bottom of the event // pixel_offset gives the number of pixels between the bottom of the event
// and the bottom of the container. // and the bottom of the container.
scrollToEvent: function(event_id, pixel_offset) { scrollToEvent: function(eventId, pixelOffset) {
var scrollNode = this._getScrollNode(); var scrollNode = this._getScrollNode();
if (!scrollNode) return; if (!scrollNode) return;
var messageWrapper = this.refs.messagePanel; var messageWrapper = this.refs.messagePanel;
if (messageWrapper === undefined) return; if (messageWrapper === undefined) return;
var idx = this._indexForEventId(event_id); var idx = this._indexForEventId(eventId);
if (idx === null) { if (idx === null) {
// we don't seem to have this event in our timeline. Presumably // we don't seem to have this event in our timeline. Presumably
// it's fallen out of scrollback. We ought to backfill until we // it's fallen out of scrollback. We ought to backfill until we
@ -817,19 +817,26 @@ module.exports = React.createClass({
// looking for a non-existent event. // looking for a non-existent event.
// //
// for now, just scroll to the top of the buffer. // for now, just scroll to the top of the buffer.
console.log("Refusing to scroll to unknown event "+event_id); console.log("Refusing to scroll to unknown event "+eventId);
scrollNode.scrollTop = 0; scrollNode.scrollTop = 0;
return; return;
} }
// we might need to roll back the messagecap (to generate tiles for // we might need to roll back the messagecap (to generate tiles for
// older messages). Don't roll it back past the timeline we have, though. // older messages). This just means telling getEventTiles to create
// tiles for events we already have in our timeline (we already know
// the event in question is in our timeline, so we shouldn't need to
// backfill).
//
// we actually wind back slightly further than the event in question,
// because we want the event to be at the *bottom* of the container.
// Don't roll it back past the timeline we have, though.
var minCap = this.state.room.timeline.length - Math.min(idx - INITIAL_SIZE, 0); var minCap = this.state.room.timeline.length - Math.min(idx - INITIAL_SIZE, 0);
if (minCap > this.state.messageCap) { if (minCap > this.state.messageCap) {
this.setState({messageCap: minCap}); this.setState({messageCap: minCap});
} }
var node = this.eventNodes[event_id]; var node = this.eventNodes[eventId];
if (node === null) { if (node === null) {
// getEventTiles should have sorted this out when we set the // getEventTiles should have sorted this out when we set the
// messageCap, so this is weird. // messageCap, so this is weird.
@ -839,7 +846,7 @@ module.exports = React.createClass({
var wrapperRect = ReactDOM.findDOMNode(messageWrapper).getBoundingClientRect(); var wrapperRect = ReactDOM.findDOMNode(messageWrapper).getBoundingClientRect();
var boundingRect = node.getBoundingClientRect(); var boundingRect = node.getBoundingClientRect();
scrollNode.scrollTop += boundingRect.bottom + pixel_offset - wrapperRect.bottom; scrollNode.scrollTop += boundingRect.bottom + pixelOffset - wrapperRect.bottom;
}, },
_calculateScrollState: function() { _calculateScrollState: function() {