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

Refactor of the RoomTooltip, so that it is easier to use, and also works with Safari

pull/21833/head
wmwragg 2016-09-02 15:47:40 +01:00
parent e7d4ef74d0
commit 4c05edb71b
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/components/views/rooms/RoomList.js
View File

@ -77,6 +77,7 @@ module.exports = React.createClass({
switch (payload.action) {
case 'view_tooltip':
this.tooltip = payload.tooltip;
this.tooltipParent = payload.parent;
this._repositionTooltip();
if (this.tooltip) this.tooltip.style.display = 'block';
break;
@ -275,11 +276,9 @@ module.exports = React.createClass({
},
_repositionTooltip: function(e) {
// We access the parent of the parent, as the tooltip is inside a container
// Needs refactoring into a better multipurpose tooltip
if (this.tooltip && this.tooltip.parentElement && this.tooltip.parentElement.parentElement) {
var scroll = ReactDOM.findDOMNode(this);
this.tooltip.style.top = (3 + scroll.parentElement.offsetTop + this.tooltip.parentElement.parentElement.offsetTop - this._getScrollNode().scrollTop) + "px";
if (this.tooltip && this.tooltipParent) {
this.tooltip.style.top = this.tooltipParent.getBoundingClientRect().top + "px";
this.tooltip.style.left = this.tooltipParent.getBoundingClientRect().right + "px";
}
},

2
src/components/views/rooms/RoomTile.js
View File

@ -248,7 +248,7 @@ module.exports = React.createClass({
}
else if (this.state.hover) {
var RoomTooltip = sdk.getComponent("rooms.RoomTooltip");
label = <RoomTooltip room={this.props.room}/>;
label = <RoomTooltip room={this.props.room} component={this} />;
}
var incomingCallBox;