matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-07-22 18:41:57 +03:00
Code Activity

Fix spinner appearing above RP header

Browse Source 
By wrapping the spinner in the mx_MemberList class. Also, use mx_RoomHeader_cancelButton for group settings cancel
This commit is contained in:
Luke Barnard
2017-09-27 10:36:44 +01:00
parent 3bdf347a08
commit 1ca9102442
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/structures/GroupView.js
View File

@ -843,8 +843,8 @@ export default React.createClass({
</AccessibleButton>, </AccessibleButton>,
); );
rightButtons.push( rightButtons.push(
<AccessibleButton className='mx_GroupView_textButton' onClick={this._onCancelClick} key="_cancelButton"> <AccessibleButton className="mx_RoomHeader_cancelButton" onClick={this._onCancelClick} key="_cancelButton">
<img src="img/cancel.svg" className='mx_filterFlipColor' <img src="img/cancel.svg" className="mx_filterFlipColor"
width="18" height="18" alt={_t("Cancel")}/> width="18" height="18" alt={_t("Cancel")}/>
</AccessibleButton>, </AccessibleButton>,
); );

4
src/components/views/groups/GroupMemberList.js
View File

@ -124,7 +124,9 @@ export default withMatrixClient(React.createClass({
render: function() { render: function() {
if (this.state.fetching) { if (this.state.fetching) {
const Spinner = sdk.getComponent("elements.Spinner"); const Spinner = sdk.getComponent("elements.Spinner");
return <Spinner />; return (<div className="mx_MemberList">
<Spinner />
</div>);
} else if (this.state.members === null) { } else if (this.state.members === null) {
return null; return null;
} }