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

Commit 2d73f09

Browse files
authored
Delint MatrixChat, again (#979)
grrr.
1 parent 861cae8 commit 2d73f09

File tree

1 file changed

+30
-30
lines changed

1 file changed

+30
-30
lines changed

src/components/structures/MatrixChat.js

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -396,7 +396,7 @@ module.exports = React.createClass({
396396
}, (err) => {
397397
modal.close();
398398
Modal.createDialog(ErrorDialog, {
399-
title: _t('Failed to reject invitation'),
399+
title: _t('Failed to reject invitation'),
400400
description: err.toString(),
401401
});
402402
});
@@ -445,8 +445,8 @@ module.exports = React.createClass({
445445
title: _t('Create Room'),
446446
description: _t('Room name (optional)'),
447447
button: _t('Create Room'),
448-
onFinished: (should_create, name) => {
449-
if (should_create) {
448+
onFinished: (shouldCreate, name) => {
449+
if (shouldCreate) {
450450
const createOpts = {};
451451
if (name) createOpts.name = name;
452452
createRoom({createOpts}).done();
@@ -579,44 +579,44 @@ module.exports = React.createClass({
579579

580580
// switch view to the given room
581581
//
582-
// @param {Object} room_info Object containing data about the room to be joined
583-
// @param {string=} room_info.room_id ID of the room to join. One of room_id or room_alias must be given.
584-
// @param {string=} room_info.room_alias Alias of the room to join. One of room_id or room_alias must be given.
585-
// @param {boolean=} room_info.auto_join If true, automatically attempt to join the room if not already a member.
586-
// @param {boolean=} room_info.show_settings Makes RoomView show the room settings dialog.
587-
// @param {string=} room_info.event_id ID of the event in this room to show: this will cause a switch to the
582+
// @param {Object} roomInfo Object containing data about the room to be joined
583+
// @param {string=} roomInfo.room_id ID of the room to join. One of room_id or room_alias must be given.
584+
// @param {string=} roomInfo.room_alias Alias of the room to join. One of room_id or room_alias must be given.
585+
// @param {boolean=} roomInfo.auto_join If true, automatically attempt to join the room if not already a member.
586+
// @param {boolean=} roomInfo.show_settings Makes RoomView show the room settings dialog.
587+
// @param {string=} roomInfo.event_id ID of the event in this room to show: this will cause a switch to the
588588
// context of that particular event.
589-
// @param {Object=} room_info.third_party_invite Object containing data about the third party
589+
// @param {Object=} roomInfo.third_party_invite Object containing data about the third party
590590
// we received to join the room, if any.
591-
// @param {string=} room_info.third_party_invite.inviteSignUrl 3pid invite sign URL
592-
// @param {string=} room_info.third_party_invite.invitedEmail The email address the invite was sent to
593-
// @param {Object=} room_info.oob_data Object of additional data about the room
591+
// @param {string=} roomInfo.third_party_invite.inviteSignUrl 3pid invite sign URL
592+
// @param {string=} roomInfo.third_party_invite.invitedEmail The email address the invite was sent to
593+
// @param {Object=} roomInfo.oob_data Object of additional data about the room
594594
// that has been passed out-of-band (eg.
595595
// room name and avatar from an invite email)
596-
_viewRoom: function(room_info) {
596+
_viewRoom: function(roomInfo) {
597597
this.focusComposer = true;
598598

599599
const newState = {
600-
initialEventId: room_info.event_id,
601-
highlightedEventId: room_info.event_id,
600+
initialEventId: roomInfo.event_id,
601+
highlightedEventId: roomInfo.event_id,
602602
initialEventPixelOffset: undefined,
603603
page_type: PageTypes.RoomView,
604-
thirdPartyInvite: room_info.third_party_invite,
605-
roomOobData: room_info.oob_data,
606-
currentRoomAlias: room_info.room_alias,
607-
autoJoin: room_info.auto_join,
604+
thirdPartyInvite: roomInfo.third_party_invite,
605+
roomOobData: roomInfo.oob_data,
606+
currentRoomAlias: roomInfo.room_alias,
607+
autoJoin: roomInfo.auto_join,
608608
};
609609

610-
if (!room_info.room_alias) {
611-
newState.currentRoomId = room_info.room_id;
610+
if (!roomInfo.room_alias) {
611+
newState.currentRoomId = roomInfo.room_id;
612612
}
613613

614614
// if we aren't given an explicit event id, look for one in the
615615
// scrollStateMap.
616616
//
617617
// TODO: do this in RoomView rather than here
618-
if (!room_info.event_id && this.refs.loggedInView) {
619-
const scrollState = this.refs.loggedInView.getScrollStateForRoom(room_info.room_id);
618+
if (!roomInfo.event_id && this.refs.loggedInView) {
619+
const scrollState = this.refs.loggedInView.getScrollStateForRoom(roomInfo.room_id);
620620
if (scrollState) {
621621
newState.initialEventId = scrollState.focussedEvent;
622622
newState.initialEventPixelOffset = scrollState.pixelOffset;
@@ -628,15 +628,15 @@ module.exports = React.createClass({
628628
let waitFor = q(null);
629629
if (!this.firstSyncComplete) {
630630
if (!this.firstSyncPromise) {
631-
console.warn('Cannot view a room before first sync. room_id:', room_info.room_id);
631+
console.warn('Cannot view a room before first sync. room_id:', roomInfo.room_id);
632632
return;
633633
}
634634
waitFor = this.firstSyncPromise.promise;
635635
}
636636

637637
waitFor.done(() => {
638-
let presentedId = room_info.room_alias || room_info.room_id;
639-
const room = MatrixClientPeg.get().getRoom(room_info.room_id);
638+
let presentedId = roomInfo.room_alias || roomInfo.room_id;
639+
const room = MatrixClientPeg.get().getRoom(roomInfo.room_id);
640640
if (room) {
641641
const theAlias = Rooms.getDisplayAliasForRoom(room);
642642
if (theAlias) presentedId = theAlias;
@@ -648,8 +648,8 @@ module.exports = React.createClass({
648648
}
649649
}
650650

651-
if (room_info.event_id) {
652-
presentedId += "/" + room_info.event_id;
651+
if (roomInfo.event_id) {
652+
presentedId += "/" + roomInfo.event_id;
653653
}
654654
this.notifyNewScreen('room/' + presentedId);
655655
newState.ready = true;
@@ -663,7 +663,7 @@ module.exports = React.createClass({
663663
title: _t('Start a chat'),
664664
description: _t("Who would you like to communicate with?"),
665665
placeholder: _t("Email, name or matrix ID"),
666-
button: _t("Start Chat")
666+
button: _t("Start Chat"),
667667
});
668668
},
669669

0 commit comments

Comments
 (0)