forked from matrix/element-web
parent
56c6a15ddf
commit
2163a54617
|
@ -205,7 +205,6 @@ module.exports = React.createClass({
|
||||||
} else if (this.props.groupId) {
|
} else if (this.props.groupId) {
|
||||||
this.setState({
|
this.setState({
|
||||||
phase: this.Phase.GroupMemberList,
|
phase: this.Phase.GroupMemberList,
|
||||||
groupId: payload.groupId,
|
|
||||||
member: payload.member,
|
member: payload.member,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
@ -213,13 +212,20 @@ module.exports = React.createClass({
|
||||||
} else if (payload.action === "view_group") {
|
} else if (payload.action === "view_group") {
|
||||||
this.setState({
|
this.setState({
|
||||||
phase: this.Phase.GroupMemberList,
|
phase: this.Phase.GroupMemberList,
|
||||||
groupId: payload.groupId,
|
|
||||||
member: null,
|
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") {
|
} else if (payload.action === "view_group_user") {
|
||||||
this.setState({
|
this.setState({
|
||||||
phase: this.Phase.GroupMemberInfo,
|
phase: this.Phase.GroupMemberInfo,
|
||||||
groupId: payload.groupId,
|
|
||||||
member: payload.member,
|
member: payload.member,
|
||||||
});
|
});
|
||||||
} else if (payload.action === "view_room") {
|
} else if (payload.action === "view_room") {
|
||||||
|
@ -242,6 +248,7 @@ module.exports = React.createClass({
|
||||||
const GroupMemberList = sdk.getComponent('groups.GroupMemberList');
|
const GroupMemberList = sdk.getComponent('groups.GroupMemberList');
|
||||||
const GroupMemberInfo = sdk.getComponent('groups.GroupMemberInfo');
|
const GroupMemberInfo = sdk.getComponent('groups.GroupMemberInfo');
|
||||||
const GroupRoomList = sdk.getComponent('groups.GroupRoomList');
|
const GroupRoomList = sdk.getComponent('groups.GroupRoomList');
|
||||||
|
const GroupRoomInfo = sdk.getComponent('groups.GroupRoomInfo');
|
||||||
|
|
||||||
const TintableSvg = sdk.getComponent("elements.TintableSvg");
|
const TintableSvg = sdk.getComponent("elements.TintableSvg");
|
||||||
|
|
||||||
|
@ -340,6 +347,11 @@ module.exports = React.createClass({
|
||||||
groupMember={this.state.member}
|
groupMember={this.state.member}
|
||||||
groupId={this.props.groupId}
|
groupId={this.props.groupId}
|
||||||
key={this.state.member.user_id} />;
|
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) {
|
} else if (this.state.phase == this.Phase.NotificationPanel) {
|
||||||
panel = <NotificationPanel />;
|
panel = <NotificationPanel />;
|
||||||
} else if (this.state.phase == this.Phase.FilePanel) {
|
} else if (this.state.phase == this.Phase.FilePanel) {
|
||||||
|
|
|
@ -19,18 +19,3 @@ limitations under the License.
|
||||||
color: $primary-fg-color;
|
color: $primary-fg-color;
|
||||||
cursor: pointer;
|
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;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
|
@ -57,7 +57,7 @@ limitations under the License.
|
||||||
font-size: 14px;
|
font-size: 14px;
|
||||||
text-overflow: ellipsis;
|
text-overflow: ellipsis;
|
||||||
white-space: nowrap;
|
white-space: nowrap;
|
||||||
max-width: 135px;
|
max-width: 155px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.mx_EntityTile_details {
|
.mx_EntityTile_details {
|
||||||
|
|
Loading…
Reference in New Issue