Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Implement simple GroupRoomInfo #5493

Merged
merged 1 commit into from Nov 2, 2017
Merged

Implement simple GroupRoomInfo #5493

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
18 changes: 15 additions & 3 deletions src/components/structures/RightPanel.js
View file
Open in desktop
Expand Up @@ -205,21 +205,27 @@ module.exports = React.createClass({
} else if (this.props.groupId) {
this.setState({
phase: this.Phase.GroupMemberList,
groupId: payload.groupId,
member: payload.member,
});
}
}
} else if (payload.action === "view_group") {
this.setState({
phase: this.Phase.GroupMemberList,
groupId: payload.groupId,
member: null,
});
} else if (payload.action === "view_group_room") {
this.setState({
phase: this.Phase.GroupRoomInfo,
groupRoom: payload.groupRoom,
});
} else if (payload.action === "view_group_room_list") {
this.setState({
phase: this.Phase.GroupRoomList,
});
} else if (payload.action === "view_group_user") {
this.setState({
phase: this.Phase.GroupMemberInfo,
groupId: payload.groupId,
member: payload.member,
});
} else if (payload.action === "view_room") {
Expand All @@ -242,6 +248,7 @@ module.exports = React.createClass({
const GroupMemberList = sdk.getComponent('groups.GroupMemberList');
const GroupMemberInfo = sdk.getComponent('groups.GroupMemberInfo');
const GroupRoomList = sdk.getComponent('groups.GroupRoomList');
const GroupRoomInfo = sdk.getComponent('groups.GroupRoomInfo');

const TintableSvg = sdk.getComponent("elements.TintableSvg");

Expand Down Expand Up @@ -340,6 +347,11 @@ module.exports = React.createClass({
groupMember={this.state.member}
groupId={this.props.groupId}
key={this.state.member.user_id} />;
} else if (this.state.phase == this.Phase.GroupRoomInfo) {
panel = <GroupRoomInfo
groupRoom={this.state.groupRoom}
groupId={this.props.groupId}
key={this.state.groupRoom.roomId} />;
} else if (this.state.phase == this.Phase.NotificationPanel) {
panel = <NotificationPanel />;
} else if (this.state.phase == this.Phase.FilePanel) {
Expand Down
15 changes: 0 additions & 15 deletions src/skins/vector/css/matrix-react-sdk/views/groups/_GroupRoomList.scss
View file
Open in desktop
Expand Up @@ -19,18 +19,3 @@ limitations under the License.
color: $primary-fg-color;
cursor: pointer;
}

.mx_GroupRoomTile_delete {
opacity: 0.4;
position: absolute;
top: 6px;
right: 10px;
cursor: pointer;

display: none;
}

.mx_GroupRoomTile:hover > .mx_GroupRoomTile_delete {
display: initial;
}

2 changes: 1 addition & 1 deletion src/skins/vector/css/matrix-react-sdk/views/rooms/_EntityTile.scss
View file
Open in desktop
Expand Up @@ -57,7 +57,7 @@ limitations under the License.
font-size: 14px;
text-overflow: ellipsis;
white-space: nowrap;
max-width: 135px;
max-width: 155px;
}

.mx_EntityTile_details {
Expand Down