gaja-group
/
matrix-bot
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Removed nolonger needed conditional test, as the parent will always exist

This commit is contained in:
wmwragg 2016-09-04 08:39:32 +01:00
parent cb98e2421e
commit 7ae821e2b5
1 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/components/views/rooms/RoomTooltip.js
View File

@ -69,33 +69,31 @@ module.exports = React.createClass({
if (this.props.left) { style.left = this.props.left; } if (this.props.left) { style.left = this.props.left; }
if (this.props.right) { style.right = this.props.right; } if (this.props.right) { style.right = this.props.right; }
// If a parent exists, add the parent's position to the tooltips, so it's correctly // Add the parent's position to the tooltips, so it's correctly
// positioned, also taking into account any window zoom // positioned, also taking into account any window zoom
// NOTE: The additional 6 pixels for the left position, is to take account of the // NOTE: The additional 6 pixels for the left position, is to take account of the
// tooltips chevron // tooltips chevron
var parent = ReactDOM.findDOMNode(this).parentElement; var parent = ReactDOM.findDOMNode(this).parentElement;
if (parent) { style.top = (+style.top || 0) + parent.getBoundingClientRect().top + window.pageYOffset;
style.top = (+style.top || 0) + parent.getBoundingClientRect().top + window.pageYOffset; style.left = (+style.left || 0) + 6 + parent.getBoundingClientRect().right + window.pageXOffset;
style.left = (+style.left || 0) + 6 + parent.getBoundingClientRect().right + window.pageXOffset; style.display = "block";
style.display = "block";
var tooltip = ( var tooltip = (
<div className="mx_RoomTooltip" style={style} > <div className="mx_RoomTooltip" style={style} >
<div className="mx_RoomTooltip_chevron"></div> <div className="mx_RoomTooltip_chevron"></div>
{ label } { label }
</div> </div>
); );
// Render the tooltip manually, as we wish it not to be rendered within the parent // Render the tooltip manually, as we wish it not to be rendered within the parent
this.tooltip = ReactDOM.render(tooltip, this.tooltipContainer); this.tooltip = ReactDOM.render(tooltip, this.tooltipContainer);
// tell the roomlist about us so it can manipulate us if it wishes // tell the roomlist about us so it can manipulate us if it wishes
dis.dispatch({ dis.dispatch({
action: 'view_tooltip', action: 'view_tooltip',
tooltip: this.tooltip, tooltip: this.tooltip,
parent: parent, parent: parent,
}); });
}
}, },
render: function() { render: function() {