Skip to content
This repository was archived by the owner on Sep 11, 2024. It is now read-only.

Commit 770820e

Browse files
committed
Fix a bunch of lint complaints
1 parent 8627645 commit 770820e

File tree

11 files changed

+43
-25
lines changed

11 files changed

+43
-25
lines changed

.eslintignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
src/component-index.js

src/components/structures/UserSettings.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ var UserSettingsStore = require('../../UserSettingsStore');
2626
var GeminiScrollbar = require('react-gemini-scrollbar');
2727
var Email = require('../../email');
2828
var AddThreepid = require('../../AddThreepid');
29-
var AccessibleButton = require('../views/elements/AccessibleButton');
29+
import AccessibleButton from '../views/elements/AccessibleButton';
3030

3131
// if this looks like a release, use the 'version' from package.json; else use
3232
// the git sha.

src/components/views/avatars/BaseAvatar.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ limitations under the License.
1919
var React = require('react');
2020
var AvatarLogic = require("../../../Avatar");
2121
import sdk from '../../../index';
22-
var AccessibleButton = require('../elements/AccessibleButton');
22+
import AccessibleButton from '../elements/AccessibleButton';
2323

2424
module.exports = React.createClass({
2525
displayName: 'BaseAvatar',

src/components/views/dialogs/ChatInviteDialog.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ var DMRoomMap = require('../../../utils/DMRoomMap');
2424
var rate_limited_func = require("../../../ratelimitedfunc");
2525
var dis = require("../../../dispatcher");
2626
var Modal = require('../../../Modal');
27-
var AccessibleButton = require('../elements/AccessibleButton');
27+
import AccessibleButton from '../elements/AccessibleButton';
2828

2929
const TRUNCATE_QUERY_LIST = 40;
3030

@@ -437,7 +437,8 @@ module.exports = React.createClass({
437437
<div className="mx_Dialog_title">
438438
{this.props.title}
439439
</div>
440-
<AccessibleButton className="mx_ChatInviteDialog_cancel" onClick={this.onCancel} >
440+
<AccessibleButton className="mx_ChatInviteDialog_cancel"
441+
onClick={this.onCancel} >
441442
<TintableSvg src="img/icons-close-button.svg" width="35" height="35" />
442443
</AccessibleButton>
443444
<div className="mx_ChatInviteDialog_label">

src/components/views/elements/AccessibleButton.js

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,20 @@
1717
import React from 'react';
1818

1919
/**
20-
* AccessibleButton is a generic wrapper for any element that should be treated as a button.
21-
* Identifies the element as a button, setting proper tab indexing and keyboard activation behavior.
20+
* AccessibleButton is a generic wrapper for any element that should be treated
21+
* as a button. Identifies the element as a button, setting proper tab
22+
* indexing and keyboard activation behavior.
23+
*
24+
* @param {Object} props react element properties
25+
* @returns {Object} rendered react
2226
*/
2327
export default function AccessibleButton(props) {
2428
const {element, onClick, children, ...restProps} = props;
2529
restProps.onClick = onClick;
2630
restProps.onKeyDown = function(e) {
2731
if (e.keyCode == 13 || e.keyCode == 32) return onClick();
2832
};
29-
restProps.tabIndex = restProps.tabIndex || "0";
33+
restProps.tabIndex = restProps.tabIndex || "0";
3034
restProps.role = "button";
3135
return React.createElement(element, restProps, children);
3236
}
@@ -44,7 +48,7 @@ AccessibleButton.propTypes = {
4448
};
4549

4650
AccessibleButton.defaultProps = {
47-
element: 'div'
51+
element: 'div',
4852
};
4953

5054
AccessibleButton.displayName = "AccessibleButton";

src/components/views/rooms/EntityTile.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ var React = require('react');
2020

2121
var MatrixClientPeg = require('../../../MatrixClientPeg');
2222
var sdk = require('../../../index');
23-
var AccessibleButton = require('../elements/AccessibleButton');
23+
import AccessibleButton from '../elements/AccessibleButton';
2424

2525

2626
var PRESENCE_CLASS = {

src/components/views/rooms/MemberInfo.js

Lines changed: 22 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ var DMRoomMap = require('../../../utils/DMRoomMap');
3535
var Unread = require('../../../Unread');
3636
var Receipt = require('../../../utils/Receipt');
3737
var WithMatrixClient = require('../../../wrappers/WithMatrixClient');
38-
var AccessibleButton = require('../elements/AccessibleButton');
38+
import AccessibleButton from '../elements/AccessibleButton';
3939

4040
module.exports = WithMatrixClient(React.createClass({
4141
displayName: 'MemberInfo',
@@ -636,20 +636,31 @@ module.exports = WithMatrixClient(React.createClass({
636636
}
637637

638638
if (this.state.can.kick) {
639-
kickButton = <AccessibleButton className="mx_MemberInfo_field" onClick={this.onKick}>
640-
{ this.props.member.membership === "invite" ? "Disinvite" : "Kick" }
641-
</AccessibleButton>;
639+
const membership = this.props.member.membership;
640+
const kickLabel = membership === "invite" ? "Disinvite" : "Kick";
641+
kickButton = (
642+
<AccessibleButton className="mx_MemberInfo_field"
643+
onClick={this.onKick}>
644+
{kickLabel}
645+
</AccessibleButton>
646+
);
642647
}
643648
if (this.state.can.ban) {
644-
banButton = <AccessibleButton className="mx_MemberInfo_field" onClick={this.onBan}>
645-
Ban
646-
</AccessibleButton>;
649+
banButton = (
650+
<AccessibleButton className="mx_MemberInfo_field"
651+
onClick={this.onBan}>
652+
Ban
653+
</AccessibleButton>
654+
);
647655
}
648656
if (this.state.can.mute) {
649-
var muteLabel = this.state.muted ? "Unmute" : "Mute";
650-
muteButton = <AccessibleButton className="mx_MemberInfo_field" onClick={this.onMuteToggle}>
651-
{muteLabel}
652-
</AccessibleButton>;
657+
const muteLabel = this.state.muted ? "Unmute" : "Mute";
658+
muteButton = (
659+
<AccessibleButton className="mx_MemberInfo_field"
660+
onClick={this.onMuteToggle}>
661+
{muteLabel}
662+
</AccessibleButton>
663+
);
653664
}
654665
if (this.state.can.toggleMod) {
655666
var giveOpLabel = this.state.isTargetMod ? "Revoke Moderator" : "Make Moderator";

src/components/views/rooms/RoomHeader.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ var rate_limited_func = require('../../../ratelimitedfunc');
2626
var linkify = require('linkifyjs');
2727
var linkifyElement = require('linkifyjs/element');
2828
var linkifyMatrix = require('../../../linkify-matrix');
29-
var AccessibleButton = require('../elements/AccessibleButton');
29+
import AccessibleButton from '../elements/AccessibleButton';
3030

3131
linkifyMatrix(linkify);
3232

src/components/views/rooms/RoomTile.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ var sdk = require('../../../index');
2626
var ContextualMenu = require('../../structures/ContextualMenu');
2727
var RoomNotifs = require('../../../RoomNotifs');
2828
var FormattingUtils = require('../../../utils/FormattingUtils');
29-
var AccessibleButton = require('../elements/AccessibleButton');
29+
import AccessibleButton from '../elements/AccessibleButton';
3030
var UserSettingsStore = require('../../../UserSettingsStore');
3131

3232
module.exports = React.createClass({

src/components/views/rooms/SimpleRoomHeader.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ limitations under the License.
1919
var React = require('react');
2020
var sdk = require('../../../index');
2121
var dis = require("../../../dispatcher");
22-
var AccessibleButton = require('../elements/AccessibleButton');
22+
import AccessibleButton from '../elements/AccessibleButton';
2323

2424
/*
2525
* A stripped-down room header used for things like the user settings

0 commit comments

Comments
 (0)