mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-10-22 18:55:47 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fix spacing errors (#7484)

Browse source
This commit is contained in:
J. Ryan Stinnett 2022-01-10 12:57:20 +00:00 committed by GitHub
parent 8f60d8d2c7
commit 6199c337ea
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
26 changed files with 74 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
package.json
View file

@ -71,7 +71,6 @@
"emojibase-data": "^6.2.0",
"emojibase-regex": "^5.1.3",
"escape-html": "^1.0.3",
"eslint-plugin-import": "^2.25.2",
"file-saver": "^2.0.5",
"filesize": "6.1.0",
"flux": "2.1.1",
@ -166,8 +165,9 @@
"enzyme-to-json": "^3.6.2",
"eslint": "7.18.0",
"eslint-config-google": "^0.14.0",
"eslint-plugin-import": "^2.25.4",
"eslint-plugin-jsx-a11y": "^6.5.1",
"eslint-plugin-matrix-org": "github:matrix-org/eslint-plugin-matrix-org#2fc59ae12ff551e91c41a1b185be25c77ad02190",
"eslint-plugin-matrix-org": "^0.4.0",
"eslint-plugin-react": "^7.22.0",
"eslint-plugin-react-hooks": "^4.2.0",
"glob": "^7.1.6",

2
src/CountlyAnalytics.ts
View file

@ -439,7 +439,7 @@ export default class CountlyAnalytics {
public async disable() {
if (this.disabled) return;
await this.track("Opt-Out" );
await this.track("Opt-Out");
this.endSession();
window.clearInterval(this.heartbeatIntervalId);
window.clearTimeout(this.activityIntervalId);

2
src/Markdown.ts
View file

@ -212,7 +212,7 @@ export default class Markdown {
const walker = this.parsed.walker();
let ev;
while ( (ev = walker.next()) ) {
while (ev = walker.next()) {
const node = ev.node;
if (TEXT_NODES.indexOf(node.type) > -1) {
// definitely text

2
src/components/structures/EmbeddedPage.tsx
View file

@ -86,7 +86,7 @@ export default class EmbeddedPage extends React.PureComponent<IProps, IState> {
return;
}
body = body.replace(/_t\(['"]([\s\S]*?)['"]\)/mg, (match, g1)=>this.translate(g1));
body = body.replace(/_t\(['"]([\s\S]*?)['"]\)/mg, (match, g1) => this.translate(g1));
if (this.props.replaceMap) {
Object.keys(this.props.replaceMap).forEach(key => {

2
src/components/structures/auth/Registration.tsx
View file

@ -363,7 +363,7 @@ export default class Registration extends React.Component<IProps, IState> {
return Promise.resolve();
}
const matrixClient = MatrixClientPeg.get();
return matrixClient.getPushers().then((resp)=>{
return matrixClient.getPushers().then((resp) => {
const pushers = resp.pushers;
for (let i = 0; i < pushers.length; ++i) {
if (pushers[i].kind === 'email') {

2
src/components/views/dialogs/ModalWidgetDialog.tsx
View file

@ -80,7 +80,7 @@ export default class ModalWidgetDialog extends React.PureComponent<IProps, IStat
}
public componentDidMount() {
const driver = new StopGapWidgetDriver( [], this.widget, WidgetKind.Modal);
const driver = new StopGapWidgetDriver([], this.widget, WidgetKind.Modal);
const messaging = new ClientWidgetApi(this.widget, this.appFrame.current, driver);
this.setState({ messaging });
}

2
src/components/views/elements/FacePile.tsx
View file

@ -94,7 +94,7 @@ const FacePile = ({ room, onlyKnownUsers = true, numShown = DEFAULT_NUM_FACES, .
<TextWithTooltip class="mx_FacePile_faces" tooltip={tooltip} tooltipProps={{ yOffset: 32 }}>
{ members.length > numShown ? <span className="mx_FacePile_face mx_FacePile_more" /> : null }
{ shownMembers.map(m =>
<MemberAvatar key={m.userId} member={m} width={28} height={28} className="mx_FacePile_face" /> ) }
<MemberAvatar key={m.userId} member={m} width={28} height={28} className="mx_FacePile_face" />) }
</TextWithTooltip>
{ onlyKnownUsers && <span className="mx_FacePile_summary">
{ _t("%(count)s people you know have already joined", { count: members.length }) }

4
src/components/views/messages/MPollBody.tsx
View file

@ -329,7 +329,7 @@ export default class MPollBody extends React.Component<IBodyProps, IState> {
}
const newEventIds = newEvents.map((mxEvent: MatrixEvent) => mxEvent.getId());
this.seenEventIds = this.seenEventIds.concat(newEventIds);
this.setState( { selected: newSelected } );
this.setState({ selected: newSelected });
}
private totalVotes(collectedVotes: Map<string, number>): number {
@ -381,7 +381,7 @@ export default class MPollBody extends React.Component<IBodyProps, IState> {
);
}
} else {
totalText = _t( "Based on %(count)s votes", { count: totalVotes } );
totalText = _t("Based on %(count)s votes", { count: totalVotes });
}
return <div className="mx_MPollBody">

2
src/components/views/right_panel/RoomHeaderButtons.tsx
View file

@ -265,7 +265,7 @@ export default class RoomHeaderButtons extends HeaderButtons<IProps> {
return <>
{
Array.from(rightPanelPhaseButtons.keys()).map((phase) =>
( this.props.excludedRightPanelPhaseButtons.includes(phase)
(this.props.excludedRightPanelPhaseButtons.includes(phase)
? null
: rightPanelPhaseButtons.get(phase)))
}

2
src/components/views/right_panel/UserInfo.tsx
View file

@ -94,7 +94,7 @@ const disambiguateDevices = (devices: IDevice[]) => {
}
for (const name in names) {
if (names[name].length > 1) {
names[name].forEach((j)=>{
names[name].forEach((j) => {
devices[j].ambiguous = true;
});
}

14
src/components/views/rooms/EventTile.tsx
View file

@ -1245,16 +1245,16 @@ export default class EventTile extends React.Component<IProps, IState> {
<div className="mx_EventTile_keyRequestInfo_tooltip_contents">
<p>
{ this.state.previouslyRequestedKeys ?
_t( 'Your key share request has been sent - please check your other sessions ' +
'for key share requests.') :
_t( 'Key share requests are sent to your other sessions automatically. If you ' +
'rejected or dismissed the key share request on your other sessions, click ' +
'here to request the keys for this session again.')
_t('Your key share request has been sent - please check your other sessions ' +
'for key share requests.') :
_t('Key share requests are sent to your other sessions automatically. If you ' +
'rejected or dismissed the key share request on your other sessions, click ' +
'here to request the keys for this session again.')
}
</p>
<p>
{ _t( 'If your other sessions do not have the key for this message you will not ' +
'be able to decrypt them.')
{ _t('If your other sessions do not have the key for this message you will not ' +
'be able to decrypt them.')
}
</p>
</div>;

2
src/components/views/rooms/MemberList.tsx
View file

@ -309,7 +309,7 @@ export default class MemberList extends React.Component<IProps, IState> {
return this.createOverflowTile(overflowCount, totalCount, this.showMoreInvitedMemberList);
};
private createOverflowTile = (overflowCount: number, totalCount: number, onClick: () => void): JSX.Element=> {
private createOverflowTile = (overflowCount: number, totalCount: number, onClick: () => void): JSX.Element => {
// For now we'll pretend this is any entity. It should probably be a separate tile.
const text = _t("and %(count)s others...", { count: overflowCount });
return (

2
src/components/views/settings/ThemeChoicePanel.tsx
View file

@ -170,7 +170,7 @@ export default class ThemeChoicePanel extends React.Component<IProps, IState> {
checked={isHighContrastTheme(this.state.theme)}
onChange={(e) => this.highContrastThemeChanged(e.target.checked)}
>
{ _t( "Use high contrast" ) }
{ _t("Use high contrast") }
</StyledCheckbox>
</div>;
}

2
src/components/views/settings/account/EmailAddresses.tsx
View file

@ -93,7 +93,7 @@ export class ExistingEmailAddress extends React.Component<IExistingEmailAddressP
return (
<div className="mx_ExistingEmailAddress">
<span className="mx_ExistingEmailAddress_promptText">
{ _t("Remove %(email)s?", { email: this.props.email.address } ) }
{ _t("Remove %(email)s?", { email: this.props.email.address }) }
</span>
<AccessibleButton
onClick={this.onActuallyRemove}

2
src/components/views/settings/tabs/user/HelpUserSettingsTab.tsx
View file

@ -337,7 +337,7 @@ export default class HelpUserSettingsTab extends React.Component<IProps, IState>
<details>
<summary>{ _t("Access Token") }</summary><br />
<b>{ _t("Your access token gives full access to your account."
+ " Do not share it with anyone." ) }</b>
+ " Do not share it with anyone.") }</b>
<div className="mx_HelpUserSettingsTab_copy">
<code>{ MatrixClientPeg.get().getAccessToken() }</code>
<AccessibleTooltipButton

2
src/components/views/settings/tabs/user/LabsUserSettingsTab.tsx
View file

@ -81,7 +81,7 @@ export default class LabsUserSettingsTab extends React.Component<{}, IState> {
let betaSection;
if (betas.length) {
betaSection = <div className="mx_SettingsTab_section">
{ betas.map(f => <BetaCard key={f} featureId={f} /> ) }
{ betas.map(f => <BetaCard key={f} featureId={f} />) }
</div>;
}

4
src/components/views/settings/tabs/user/SecurityUserSettingsTab.tsx
View file

@ -96,10 +96,10 @@ export default class SecurityUserSettingsTab extends React.Component<IProps, ISt
};
}
private onAction = ({ action }: ActionPayload)=> {
private onAction = ({ action }: ActionPayload) => {
if (action === "ignore_state_changed") {
const ignoredUserIds = MatrixClientPeg.get().getIgnoredUsers();
const newWaitingUnignored = this.state.waitingUnignored.filter(e=> ignoredUserIds.includes(e));
const newWaitingUnignored = this.state.waitingUnignored.filter(e => ignoredUserIds.includes(e));
this.setState({ ignoredUserIds, waitingUnignored: newWaitingUnignored });
}
};

2
src/utils/FormattingUtils.ts
View file

@ -131,7 +131,7 @@ export function formatCommaSeparatedList(items: Array<JSX.Element | string>, ite
}
if (remaining > 0) {
return _t("%(items)s and %(count)s others", { items: joinedItems, count: remaining } );
return _t("%(items)s and %(count)s others", { items: joinedItems, count: remaining });
} else {
return _t("%(items)s and %(lastItem)s", { items: joinedItems, lastItem });
}

2
src/verification.ts
View file

@ -124,7 +124,7 @@ function setRightPanel(state: IRightPanelCardState) {
}
}
export function pendingVerificationRequestForUser(user: User | RoomMember | GroupMember ) {
export function pendingVerificationRequestForUser(user: User | RoomMember | GroupMember) {
const cli = MatrixClientPeg.get();
const dmRoom = findDMForUser(cli, user.userId);
if (dmRoom) {

4
test/PosthogAnalytics-test.ts
View file

@ -157,7 +157,7 @@ describe("PosthogAnalytics", () => {
getAccountDataFromServer = jest.fn().mockResolvedValue(null);
setAccountData = jest.fn().mockResolvedValue({});
}
await analytics.identifyUser(new FakeClient(), () => "analytics_id" );
await analytics.identifyUser(new FakeClient(), () => "analytics_id");
expect(fakePosthog.identify.mock.calls[0][0]).toBe("analytics_id");
});
@ -173,7 +173,7 @@ describe("PosthogAnalytics", () => {
getAccountDataFromServer = jest.fn().mockResolvedValue({ id: "existing_analytics_id" });
setAccountData = jest.fn().mockResolvedValue({});
}
await analytics.identifyUser(new FakeClient(), () => "new_analytics_id" );
await analytics.identifyUser(new FakeClient(), () => "new_analytics_id");
expect(fakePosthog.identify.mock.calls[0][0]).toBe("existing_analytics_id");
});
});

10
test/components/views/messages/MPollBody-test.tsx
View file

@ -461,7 +461,7 @@ describe("MPollBody", () => {
txnId?: string,
callback?: Callback,
): Promise<ISendEventResponse> => {
receivedEvents.push( { roomId, eventType, content, txnId, callback } );
receivedEvents.push({ roomId, eventType, content, txnId, callback });
return Promise.resolve({ "event_id": "fake_tracked_send_id" });
};
@ -482,7 +482,7 @@ describe("MPollBody", () => {
txnId?: string,
callback?: Callback,
): Promise<ISendEventResponse> => {
receivedEvents.push( { roomId, eventType, content, txnId, callback } );
receivedEvents.push({ roomId, eventType, content, txnId, callback });
return Promise.resolve({ "event_id": "fake_tracked_send_id" });
};
@ -506,7 +506,7 @@ describe("MPollBody", () => {
txnId?: string,
callback?: Callback,
): Promise<ISendEventResponse> => {
receivedEvents.push( { roomId, eventType, content, txnId, callback } );
receivedEvents.push({ roomId, eventType, content, txnId, callback });
return Promise.resolve({ "event_id": "fake_tracked_send_id" });
};
@ -528,7 +528,7 @@ describe("MPollBody", () => {
txnId?: string,
callback?: Callback,
): Promise<ISendEventResponse> => {
receivedEvents.push( { roomId, eventType, content, txnId, callback } );
receivedEvents.push({ roomId, eventType, content, txnId, callback });
return Promise.resolve({ "event_id": "fake_tracked_send_id" });
};
@ -553,7 +553,7 @@ describe("MPollBody", () => {
txnId?: string,
callback?: Callback,
): Promise<ISendEventResponse> => {
receivedEvents.push( { roomId, eventType, content, txnId, callback } );
receivedEvents.push({ roomId, eventType, content, txnId, callback });
return Promise.resolve({ "event_id": "fake_tracked_send_id" });
};

8
test/components/views/rooms/SendMessageComposer-test.tsx
View file

@ -340,10 +340,10 @@ describe('<SendMessageComposer/>', () => {
const model2 = new EditorModel([], createPartCreator(), createRenderer());
const model3 = new EditorModel([], createPartCreator(), createRenderer());
const model4 = new EditorModel([], createPartCreator(), createRenderer());
model.update("+😊hello", "insertText", new DocumentOffset( 8, true));
model2.update(" +😊", "insertText", new DocumentOffset( 4, true));
model3.update("+ 😊😊", "insertText", new DocumentOffset( 6, true));
model4.update("+smiley", "insertText", new DocumentOffset( 7, true));
model.update("+😊hello", "insertText", new DocumentOffset(8, true));
model2.update(" +😊", "insertText", new DocumentOffset(4, true));
model3.update("+ 😊😊", "insertText", new DocumentOffset(6, true));
model4.update("+smiley", "insertText", new DocumentOffset(7, true));
expect(isQuickReaction(model)).toBeFalsy();
expect(isQuickReaction(model2)).toBeFalsy();

2
test/end-to-end-tests/has-custom-app.js
View file

@ -21,4 +21,4 @@ if (idx !== -1) {
const value = process.argv[idx + 1];
hasAppUrl = !!value;
}
process.stdout.write(hasAppUrl ? "1" : "0" );
process.stdout.write(hasAppUrl ? "1" : "0");

2
test/end-to-end-tests/src/session.ts
View file

@ -114,7 +114,7 @@ export class ElementSession {
};
}
public async printElements(label: string, elements: puppeteer.ElementHandle[] ): Promise<void> {
public async printElements(label: string, elements: puppeteer.ElementHandle[]): Promise<void> {
console.log(label, await Promise.all(elements.map(this.getOuterHTML)));
}

2
test/stores/WidgetLayoutStore-test.ts
View file

@ -28,7 +28,7 @@ const mockRoom = <Room>{
currentState: {
getStateEvents: (_l, _x) => {
return {
getId: ()=>"$layoutEventId",
getId: () => "$layoutEventId",
getContent: () => null,
};
},

36
yarn.lock
View file

@ -3692,6 +3692,14 @@ eslint-module-utils@^2.7.1:
find-up "^2.1.0"
pkg-dir "^2.0.0"
eslint-module-utils@^2.7.2:
version "2.7.2"
resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.7.2.tgz#1d0aa455dcf41052339b63cada8ab5fd57577129"
integrity sha512-zquepFnWCY2ISMFwD/DqzaM++H+7PDzOpUvotJWm/y1BAFt5R4oeULgdrTejKqLkz7MA/tgstsUMNYc7wNdTrg==
dependencies:
debug "^3.2.7"
find-up "^2.1.0"
eslint-plugin-import@^2.25.2:
version "2.25.3"
resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.25.3.tgz#a554b5f66e08fb4f6dc99221866e57cfff824766"
@ -3711,6 +3719,25 @@ eslint-plugin-import@^2.25.2:
resolve "^1.20.0"
tsconfig-paths "^3.11.0"
eslint-plugin-import@^2.25.4:
version "2.25.4"
resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.25.4.tgz#322f3f916a4e9e991ac7af32032c25ce313209f1"
integrity sha512-/KJBASVFxpu0xg1kIBn9AUa8hQVnszpwgE7Ld0lKAlx7Ie87yzEzCgSkekt+le/YVhiaosO4Y14GDAOc41nfxA==
dependencies:
array-includes "^3.1.4"
array.prototype.flat "^1.2.5"
debug "^2.6.9"
doctrine "^2.1.0"
eslint-import-resolver-node "^0.3.6"
eslint-module-utils "^2.7.2"
has "^1.0.3"
is-core-module "^2.8.0"
is-glob "^4.0.3"
minimatch "^3.0.4"
object.values "^1.1.5"
resolve "^1.20.0"
tsconfig-paths "^3.12.0"
eslint-plugin-jsx-a11y@^6.5.1:
version "6.5.1"
resolved "https://registry.yarnpkg.com/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.5.1.tgz#cdbf2df901040ca140b6ec14715c988889c2a6d8"
@ -3729,9 +3756,10 @@ eslint-plugin-jsx-a11y@^6.5.1:
language-tags "^1.0.5"
minimatch "^3.0.4"
"eslint-plugin-matrix-org@github:matrix-org/eslint-plugin-matrix-org#2fc59ae12ff551e91c41a1b185be25c77ad02190":
version "0.3.5"
resolved "https://codeload.github.com/matrix-org/eslint-plugin-matrix-org/tar.gz/2fc59ae12ff551e91c41a1b185be25c77ad02190"
eslint-plugin-matrix-org@^0.4.0:
version "0.4.0"
resolved "https://registry.yarnpkg.com/eslint-plugin-matrix-org/-/eslint-plugin-matrix-org-0.4.0.tgz#de2d2db1cd471d637728133ce9a2b921690e5cd1"
integrity sha512-yVkNwtc33qtrQB4PPzpU+PUdFzdkENPan3JF4zhtAQJRUYXyvKEXnYSrXLUWYRXoYFxs9LbyI2CnhJL/RnHJaQ==
eslint-plugin-react-hooks@^4.2.0:
version "4.3.0"
@ -8458,7 +8486,7 @@ trough@^1.0.0:
resolved "https://registry.yarnpkg.com/trough/-/trough-1.0.5.tgz#b8b639cefad7d0bb2abd37d433ff8293efa5f406"
integrity sha512-rvuRbTarPXmMb79SmzEp8aqXNKcK+y0XaB298IXueQ8I2PsrATcPBCSPyK/dDNa2iWOhKlfNnOjdAOTBU/nkFA==
tsconfig-paths@^3.11.0:
tsconfig-paths@^3.11.0, tsconfig-paths@^3.12.0:
version "3.12.0"
resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.12.0.tgz#19769aca6ee8f6a1a341e38c8fa45dd9fb18899b"
integrity sha512-e5adrnOYT6zqVnWqZu7i/BQ3BnhzvGbjEjejFXO20lKIKpwTaupkCPgEfv4GZK1IBciJUEhYs3J3p75FdaTFVg==