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

delint ChatCreateOrReuseDialog 

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
pull/21833/head
Michael Telatynski 2018-06-21 11:37:06 +01:00
parent df58715a17
commit 2428eb12af
No known key found for this signature in database
GPG Key ID: 3F879DA5AD802A5E
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/components/views/dialogs/ChatCreateOrReuseDialog.js
View File

@ -1,5 +1,6 @@
/* /*
Copyright 2017 Vector Creations Ltd Copyright 2017 Vector Creations Ltd
Copyright 2018 New Vector Ltd
Licensed under the Apache License, Version 2.0 (the "License"); Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License. you may not use this file except in compliance with the License.
@ -28,6 +29,7 @@ export default class ChatCreateOrReuseDialog extends React.Component {
constructor(props) { constructor(props) {
super(props); super(props);
this.onFinished = this.onFinished.bind(this);
this.onRoomTileClick = this.onRoomTileClick.bind(this); this.onRoomTileClick = this.onRoomTileClick.bind(this);
this.state = { this.state = {
@ -53,10 +55,7 @@ export default class ChatCreateOrReuseDialog extends React.Component {
const room = client.getRoom(roomId); const room = client.getRoom(roomId);
if (room) { if (room) {
const me = room.getMember(client.credentials.userId); const me = room.getMember(client.credentials.userId);
const highlight = ( const highlight = room.getUnreadNotificationCount('highlight') > 0 || me.membership === "invite";
room.getUnreadNotificationCount('highlight') > 0 ||
me.membership == "invite"
);
tiles.push( tiles.push(
<RoomTile key={room.roomId} room={room} <RoomTile key={room.roomId} room={room}
transparent={true} transparent={true}
@ -64,7 +63,7 @@ export default class ChatCreateOrReuseDialog extends React.Component {
selected={false} selected={false}
unread={Unread.doesRoomHaveUnreadMessages(room)} unread={Unread.doesRoomHaveUnreadMessages(room)}
highlight={highlight} highlight={highlight}
isInvite={me.membership == "invite"} isInvite={me.membership === "invite"}
onClick={this.onRoomTileClick} onClick={this.onRoomTileClick}
/>, />,
); );
@ -110,6 +109,10 @@ export default class ChatCreateOrReuseDialog extends React.Component {
this.props.onExistingRoomSelected(roomId); this.props.onExistingRoomSelected(roomId);
} }
onFinished() {
this.props.onFinished(false);
}
render() { render() {
let title = ''; let title = '';
let content = null; let content = null;
@ -177,7 +180,7 @@ export default class ChatCreateOrReuseDialog extends React.Component {
const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog'); const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
return ( return (
<BaseDialog className='mx_ChatCreateOrReuseDialog' <BaseDialog className='mx_ChatCreateOrReuseDialog'
onFinished={this.props.onFinished.bind(false)} onFinished={this.onFinished}
title={title} title={title}
contentId='mx_Dialog_content' contentId='mx_Dialog_content'
> >