mirror of
https://github.com/element-hq/element-web
synced 2024-11-23 17:56:01 +03:00
fix lint
This commit is contained in:
parent
02367742bc
commit
84044fca1c
8 changed files with 14 additions and 21 deletions
|
@ -19,7 +19,6 @@ import ResizeHandle from '../views/elements/ResizeHandle';
|
||||||
import {Resizer, FixedDistributor} from '../../resizer';
|
import {Resizer, FixedDistributor} from '../../resizer';
|
||||||
|
|
||||||
export default class MainSplit extends React.Component {
|
export default class MainSplit extends React.Component {
|
||||||
|
|
||||||
constructor(props) {
|
constructor(props) {
|
||||||
super(props);
|
super(props);
|
||||||
this._setResizeContainerRef = this._setResizeContainerRef.bind(this);
|
this._setResizeContainerRef = this._setResizeContainerRef.bind(this);
|
||||||
|
|
|
@ -60,7 +60,6 @@ export default withMatrixClient(React.createClass({
|
||||||
render: function() {
|
render: function() {
|
||||||
const Loader = sdk.getComponent("elements.Spinner");
|
const Loader = sdk.getComponent("elements.Spinner");
|
||||||
const SimpleRoomHeader = sdk.getComponent('rooms.SimpleRoomHeader');
|
const SimpleRoomHeader = sdk.getComponent('rooms.SimpleRoomHeader');
|
||||||
const TintableSvg = sdk.getComponent("elements.TintableSvg");
|
|
||||||
const GroupTile = sdk.getComponent("groups.GroupTile");
|
const GroupTile = sdk.getComponent("groups.GroupTile");
|
||||||
const GeminiScrollbarWrapper = sdk.getComponent("elements.GeminiScrollbarWrapper");
|
const GeminiScrollbarWrapper = sdk.getComponent("elements.GeminiScrollbarWrapper");
|
||||||
|
|
||||||
|
|
|
@ -20,17 +20,14 @@ limitations under the License.
|
||||||
import React from 'react';
|
import React from 'react';
|
||||||
import PropTypes from 'prop-types';
|
import PropTypes from 'prop-types';
|
||||||
import classNames from 'classnames';
|
import classNames from 'classnames';
|
||||||
import { _t } from '../../languageHandler';
|
|
||||||
import sdk from '../../index';
|
import sdk from '../../index';
|
||||||
import dis from '../../dispatcher';
|
import dis from '../../dispatcher';
|
||||||
import { MatrixClient } from 'matrix-js-sdk';
|
import { MatrixClient } from 'matrix-js-sdk';
|
||||||
import RateLimitedFunc from '../../ratelimitedfunc';
|
import RateLimitedFunc from '../../ratelimitedfunc';
|
||||||
import AccessibleButton from '../../components/views/elements/AccessibleButton';
|
|
||||||
import { showGroupInviteDialog, showGroupAddRoomDialog } from '../../GroupAddressPicker';
|
import { showGroupInviteDialog, showGroupAddRoomDialog } from '../../GroupAddressPicker';
|
||||||
import GroupStore from '../../stores/GroupStore';
|
import GroupStore from '../../stores/GroupStore';
|
||||||
|
|
||||||
export default class RightPanel extends React.Component {
|
export default class RightPanel extends React.Component {
|
||||||
|
|
||||||
static get propTypes() {
|
static get propTypes() {
|
||||||
return {
|
return {
|
||||||
roomId: React.PropTypes.string, // if showing panels for a given room, this is set
|
roomId: React.PropTypes.string, // if showing panels for a given room, this is set
|
||||||
|
@ -159,13 +156,6 @@ export default class RightPanel extends React.Component {
|
||||||
const GroupRoomList = sdk.getComponent('groups.GroupRoomList');
|
const GroupRoomList = sdk.getComponent('groups.GroupRoomList');
|
||||||
const GroupRoomInfo = sdk.getComponent('groups.GroupRoomInfo');
|
const GroupRoomInfo = sdk.getComponent('groups.GroupRoomInfo');
|
||||||
|
|
||||||
const TintableSvg = sdk.getComponent("elements.TintableSvg");
|
|
||||||
|
|
||||||
const isPhaseGroup = [
|
|
||||||
RightPanel.Phase.GroupMemberInfo,
|
|
||||||
RightPanel.Phase.GroupMemberList,
|
|
||||||
].includes(this.state.phase);
|
|
||||||
|
|
||||||
let panel = <div />;
|
let panel = <div />;
|
||||||
|
|
||||||
if (this.props.roomId && this.state.phase === RightPanel.Phase.RoomMemberList) {
|
if (this.props.roomId && this.state.phase === RightPanel.Phase.RoomMemberList) {
|
||||||
|
|
|
@ -17,11 +17,13 @@ limitations under the License.
|
||||||
import React from 'react';
|
import React from 'react';
|
||||||
import { _t } from '../../../languageHandler';
|
import { _t } from '../../../languageHandler';
|
||||||
import sdk from '../../../index';
|
import sdk from '../../../index';
|
||||||
|
import dis from '../../../dispatcher';
|
||||||
import GroupStore from '../../../stores/GroupStore';
|
import GroupStore from '../../../stores/GroupStore';
|
||||||
import PropTypes from 'prop-types';
|
import PropTypes from 'prop-types';
|
||||||
import { showGroupInviteDialog } from '../../../GroupAddressPicker';
|
import { showGroupInviteDialog } from '../../../GroupAddressPicker';
|
||||||
import AccessibleButton from '../elements/AccessibleButton';
|
import AccessibleButton from '../elements/AccessibleButton';
|
||||||
import TintableSvg from '../elements/TintableSvg';
|
import TintableSvg from '../elements/TintableSvg';
|
||||||
|
import RightPanel from '../../structures/RightPanel';
|
||||||
|
|
||||||
const INITIAL_LOAD_NUM_MEMBERS = 30;
|
const INITIAL_LOAD_NUM_MEMBERS = 30;
|
||||||
|
|
||||||
|
@ -175,7 +177,11 @@ export default React.createClass({
|
||||||
|
|
||||||
let inviteButton;
|
let inviteButton;
|
||||||
if (GroupStore.isUserPrivileged(this.props.groupId)) {
|
if (GroupStore.isUserPrivileged(this.props.groupId)) {
|
||||||
inviteButton = (<AccessibleButton className="mx_RightPanel_invite" onClick={this.onInviteToGroupButtonClick}>
|
inviteButton = (
|
||||||
|
<AccessibleButton
|
||||||
|
className="mx_RightPanel_invite"
|
||||||
|
onClick={this.onInviteToGroupButtonClick}
|
||||||
|
>
|
||||||
<div className="mx_RightPanel_icon" >
|
<div className="mx_RightPanel_icon" >
|
||||||
<TintableSvg src="img/icon-invite-people.svg" width="18" height="14" />
|
<TintableSvg src="img/icon-invite-people.svg" width="18" height="14" />
|
||||||
</div>
|
</div>
|
||||||
|
@ -184,9 +190,6 @@ export default React.createClass({
|
||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<div className="mx_MemberList">
|
<div className="mx_MemberList">
|
||||||
{ inviteButton }
|
{ inviteButton }
|
||||||
<GeminiScrollbarWrapper autoshow={true}>
|
<GeminiScrollbarWrapper autoshow={true}>
|
||||||
|
|
|
@ -131,12 +131,17 @@ export default React.createClass({
|
||||||
|
|
||||||
let inviteButton;
|
let inviteButton;
|
||||||
if (GroupStore.isUserPrivileged(this.props.groupId)) {
|
if (GroupStore.isUserPrivileged(this.props.groupId)) {
|
||||||
inviteButton = (<AccessibleButton className="mx_RightPanel_invite" onClick={this.onAddRoomToGroupButtonClick}>
|
inviteButton = (
|
||||||
|
<AccessibleButton
|
||||||
|
className="mx_RightPanel_invite"
|
||||||
|
onClick={this.onAddRoomToGroupButtonClick}
|
||||||
|
>
|
||||||
<div className="mx_RightPanel_icon" >
|
<div className="mx_RightPanel_icon" >
|
||||||
<TintableSvg src="img/icons-room-add.svg" width="18" height="14" />
|
<TintableSvg src="img/icons-room-add.svg" width="18" height="14" />
|
||||||
</div>
|
</div>
|
||||||
<div className="mx_RightPanel_message">{ _t('Add rooms to this community') }</div>
|
<div className="mx_RightPanel_message">{ _t('Add rooms to this community') }</div>
|
||||||
</AccessibleButton>);
|
</AccessibleButton>
|
||||||
|
);
|
||||||
}
|
}
|
||||||
const inputBox = (
|
const inputBox = (
|
||||||
<input className="mx_GroupRoomList_query mx_textinput" id="mx_GroupRoomList_query" type="text"
|
<input className="mx_GroupRoomList_query mx_textinput" id="mx_GroupRoomList_query" type="text"
|
||||||
|
|
|
@ -25,7 +25,6 @@ import HeaderButtons from './HeaderButtons';
|
||||||
import RightPanel from '../../structures/RightPanel';
|
import RightPanel from '../../structures/RightPanel';
|
||||||
|
|
||||||
export default class GroupHeaderButtons extends HeaderButtons {
|
export default class GroupHeaderButtons extends HeaderButtons {
|
||||||
|
|
||||||
constructor(props) {
|
constructor(props) {
|
||||||
super(props, RightPanel.Phase.GroupMemberList);
|
super(props, RightPanel.Phase.GroupMemberList);
|
||||||
}
|
}
|
||||||
|
|
|
@ -21,7 +21,6 @@ import React from 'react';
|
||||||
import dis from '../../../dispatcher';
|
import dis from '../../../dispatcher';
|
||||||
|
|
||||||
export default class HeaderButtons extends React.Component {
|
export default class HeaderButtons extends React.Component {
|
||||||
|
|
||||||
constructor(props, initialPhase) {
|
constructor(props, initialPhase) {
|
||||||
super(props);
|
super(props);
|
||||||
|
|
||||||
|
|
|
@ -25,7 +25,6 @@ import HeaderButtons from './HeaderButtons';
|
||||||
import RightPanel from '../../structures/RightPanel';
|
import RightPanel from '../../structures/RightPanel';
|
||||||
|
|
||||||
export default class RoomHeaderButtons extends HeaderButtons {
|
export default class RoomHeaderButtons extends HeaderButtons {
|
||||||
|
|
||||||
constructor(props) {
|
constructor(props) {
|
||||||
super(props, RightPanel.Phase.RoomMemberList);
|
super(props, RightPanel.Phase.RoomMemberList);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue