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

Use (props,state) ordering of arguments 

There was a bug here that meant that sometimes arguments were given in the wrong order; presumably leading to the status bar not appearing for calls etc.
pull/21833/head
Luke Barnard 2017-02-09 10:01:59 +00:00
parent cc69e982a7
commit 553054409f
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/components/structures/RoomStatusBar.js
View File

@ -103,7 +103,7 @@ module.exports = React.createClass({
this.props.onResize();
}
const size = this._getSize(this.state, this.props);
const size = this._getSize(this.props, this.state);
if (size > 0) {
this.props.onVisible();
} else {
@ -145,7 +145,7 @@ module.exports = React.createClass({
// We don't need the actual height - just whether it is likely to have
// changed - so we use '0' to indicate normal size, and other values to
// indicate other sizes.
_getSize: function(state, props) {
_getSize: function(props, state) {
if (state.syncState === "ERROR" ||
(state.usersTyping.length > 0) ||
props.numUnreadMessages ||
@ -163,7 +163,8 @@ module.exports = React.createClass({
// determine if we need to call onResize
_checkForResize: function(prevProps, prevState) {
// figure out the old height and the new height of the status bar.
return this._getSize(prevProps, prevState) !== this._getSize(this.props, this.state);
return this._getSize(prevProps, prevState)
!== this._getSize(this.props, this.state);
},
// return suitable content for the image on the left of the status bar.