Auto-fix lint errors
This commit is contained in:
parent
573698789e
commit
491b179971
17 changed files with 45 additions and 46 deletions
2
src/@types/global.d.ts
vendored
2
src/@types/global.d.ts
vendored
|
@ -15,7 +15,7 @@ limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import "matrix-react-sdk/src/@types/global"; // load matrix-react-sdk's type extensions first
|
import "matrix-react-sdk/src/@types/global"; // load matrix-react-sdk's type extensions first
|
||||||
import type {Renderer} from "react-dom";
|
import type { Renderer } from "react-dom";
|
||||||
|
|
||||||
type ElectronChannel =
|
type ElectronChannel =
|
||||||
"app_onAction" |
|
"app_onAction" |
|
||||||
|
|
|
@ -27,7 +27,7 @@ interface IProps {
|
||||||
}
|
}
|
||||||
|
|
||||||
const CompatibilityView: React.FC<IProps> = ({ onAccept }) => {
|
const CompatibilityView: React.FC<IProps> = ({ onAccept }) => {
|
||||||
const {brand, mobileBuilds} = SdkConfig.get();
|
const { brand, mobileBuilds } = SdkConfig.get();
|
||||||
|
|
||||||
let ios = null;
|
let ios = null;
|
||||||
const iosCustomUrl = mobileBuilds?.ios;
|
const iosCustomUrl = mobileBuilds?.ios;
|
||||||
|
@ -71,7 +71,7 @@ const CompatibilityView: React.FC<IProps> = ({ onAccept }) => {
|
||||||
android = [];
|
android = [];
|
||||||
}
|
}
|
||||||
|
|
||||||
let mobileHeader = <h2 id="step2_heading">{_t("Use %(brand)s on mobile", {brand})}</h2>;
|
let mobileHeader = <h2 id="step2_heading">{_t("Use %(brand)s on mobile", { brand })}</h2>;
|
||||||
if (!android.length && !ios) {
|
if (!android.length && !ios) {
|
||||||
mobileHeader = null;
|
mobileHeader = null;
|
||||||
}
|
}
|
||||||
|
|
|
@ -27,7 +27,7 @@ interface IProps {
|
||||||
messages?: string[];
|
messages?: string[];
|
||||||
}
|
}
|
||||||
|
|
||||||
const ErrorView: React.FC<IProps> = ({title, messages}) => {
|
const ErrorView: React.FC<IProps> = ({ title, messages }) => {
|
||||||
return <div className="mx_ErrorView">
|
return <div className="mx_ErrorView">
|
||||||
<div className="mx_ErrorView_container">
|
<div className="mx_ErrorView_container">
|
||||||
<div className="mx_HomePage_header">
|
<div className="mx_HomePage_header">
|
||||||
|
|
|
@ -22,9 +22,9 @@ import { _t } from 'matrix-react-sdk/src/languageHandler';
|
||||||
const VectorAuthFooter = () => {
|
const VectorAuthFooter = () => {
|
||||||
const brandingConfig = SdkConfig.get().branding;
|
const brandingConfig = SdkConfig.get().branding;
|
||||||
let links = [
|
let links = [
|
||||||
{"text": "Blog", "url": "https://element.io/blog"},
|
{ "text": "Blog", "url": "https://element.io/blog" },
|
||||||
{"text": "Twitter", "url": "https://twitter.com/element_hq"},
|
{ "text": "Twitter", "url": "https://twitter.com/element_hq" },
|
||||||
{"text": "GitHub", "url": "https://github.com/vector-im/element-web"},
|
{ "text": "GitHub", "url": "https://github.com/vector-im/element-web" },
|
||||||
];
|
];
|
||||||
|
|
||||||
if (brandingConfig && brandingConfig.authFooterLinks) {
|
if (brandingConfig && brandingConfig.authFooterLinks) {
|
||||||
|
|
|
@ -19,7 +19,7 @@ import React from 'react';
|
||||||
import SdkConfig from 'matrix-react-sdk/src/SdkConfig';
|
import SdkConfig from 'matrix-react-sdk/src/SdkConfig';
|
||||||
|
|
||||||
export default class VectorAuthHeaderLogo extends React.PureComponent {
|
export default class VectorAuthHeaderLogo extends React.PureComponent {
|
||||||
static replaces = 'AuthHeaderLogo'
|
static replaces = 'AuthHeaderLogo';
|
||||||
|
|
||||||
render() {
|
render() {
|
||||||
const brandingConfig = SdkConfig.get().branding;
|
const brandingConfig = SdkConfig.get().branding;
|
||||||
|
|
|
@ -19,7 +19,7 @@ import * as sdk from 'matrix-react-sdk/src/index';
|
||||||
import SdkConfig from 'matrix-react-sdk/src/SdkConfig';
|
import SdkConfig from 'matrix-react-sdk/src/SdkConfig';
|
||||||
|
|
||||||
export default class VectorAuthPage extends React.PureComponent {
|
export default class VectorAuthPage extends React.PureComponent {
|
||||||
static replaces = 'AuthPage'
|
static replaces = 'AuthPage';
|
||||||
|
|
||||||
static welcomeBackgroundUrl;
|
static welcomeBackgroundUrl;
|
||||||
|
|
||||||
|
|
|
@ -57,7 +57,7 @@ export default class Favicon {
|
||||||
private readyCb = () => {};
|
private readyCb = () => {};
|
||||||
|
|
||||||
constructor(params: Partial<IParams> = {}) {
|
constructor(params: Partial<IParams> = {}) {
|
||||||
this.params = {...defaults, ...params};
|
this.params = { ...defaults, ...params };
|
||||||
|
|
||||||
this.icons = Favicon.getIcons();
|
this.icons = Favicon.getIcons();
|
||||||
// create work canvas
|
// create work canvas
|
||||||
|
@ -125,7 +125,7 @@ export default class Favicon {
|
||||||
}
|
}
|
||||||
|
|
||||||
private circle(n: number | string, opts?: Partial<IParams>) {
|
private circle(n: number | string, opts?: Partial<IParams>) {
|
||||||
const params = {...this.params, ...opts};
|
const params = { ...this.params, ...opts };
|
||||||
const opt = this.options(n, params);
|
const opt = this.options(n, params);
|
||||||
|
|
||||||
let more = false;
|
let more = false;
|
||||||
|
@ -214,7 +214,7 @@ export default class Favicon {
|
||||||
if (!this.isReady) {
|
if (!this.isReady) {
|
||||||
this.readyCb = () => {
|
this.readyCb = () => {
|
||||||
this.badge(content, opts);
|
this.badge(content, opts);
|
||||||
}
|
};
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -25,17 +25,17 @@ window.React = React;
|
||||||
|
|
||||||
import * as sdk from 'matrix-react-sdk';
|
import * as sdk from 'matrix-react-sdk';
|
||||||
import PlatformPeg from 'matrix-react-sdk/src/PlatformPeg';
|
import PlatformPeg from 'matrix-react-sdk/src/PlatformPeg';
|
||||||
import {_td, newTranslatableError} from 'matrix-react-sdk/src/languageHandler';
|
import { _td, newTranslatableError } from 'matrix-react-sdk/src/languageHandler';
|
||||||
import AutoDiscoveryUtils from 'matrix-react-sdk/src/utils/AutoDiscoveryUtils';
|
import AutoDiscoveryUtils from 'matrix-react-sdk/src/utils/AutoDiscoveryUtils';
|
||||||
import {AutoDiscovery} from "matrix-js-sdk/src/autodiscovery";
|
import { AutoDiscovery } from "matrix-js-sdk/src/autodiscovery";
|
||||||
import * as Lifecycle from "matrix-react-sdk/src/Lifecycle";
|
import * as Lifecycle from "matrix-react-sdk/src/Lifecycle";
|
||||||
import type MatrixChatType from "matrix-react-sdk/src/components/structures/MatrixChat";
|
import type MatrixChatType from "matrix-react-sdk/src/components/structures/MatrixChat";
|
||||||
import {MatrixClientPeg} from 'matrix-react-sdk/src/MatrixClientPeg';
|
import { MatrixClientPeg } from 'matrix-react-sdk/src/MatrixClientPeg';
|
||||||
import SdkConfig from "matrix-react-sdk/src/SdkConfig";
|
import SdkConfig from "matrix-react-sdk/src/SdkConfig";
|
||||||
|
|
||||||
import {parseQs, parseQsFromFragment} from './url_utils';
|
import { parseQs, parseQsFromFragment } from './url_utils';
|
||||||
import VectorBasePlatform from "./platform/VectorBasePlatform";
|
import VectorBasePlatform from "./platform/VectorBasePlatform";
|
||||||
import {createClient} from "matrix-js-sdk/src/matrix";
|
import { createClient } from "matrix-js-sdk/src/matrix";
|
||||||
|
|
||||||
let lastLocationHashSet: string = null;
|
let lastLocationHashSet: string = null;
|
||||||
|
|
||||||
|
@ -257,12 +257,12 @@ async function verifyServerConfig() {
|
||||||
|
|
||||||
validatedConfig = AutoDiscoveryUtils.buildValidatedConfigFromDiscovery(serverName, discoveryResult, true);
|
validatedConfig = AutoDiscoveryUtils.buildValidatedConfigFromDiscovery(serverName, discoveryResult, true);
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
const {hsUrl, isUrl, userId} = await Lifecycle.getStoredSessionVars();
|
const { hsUrl, isUrl, userId } = await Lifecycle.getStoredSessionVars();
|
||||||
if (hsUrl && userId) {
|
if (hsUrl && userId) {
|
||||||
console.error(e);
|
console.error(e);
|
||||||
console.warn("A session was found - suppressing config error and using the session's homeserver");
|
console.warn("A session was found - suppressing config error and using the session's homeserver");
|
||||||
|
|
||||||
console.log("Using pre-existing hsUrl and isUrl: ", {hsUrl, isUrl});
|
console.log("Using pre-existing hsUrl and isUrl: ", { hsUrl, isUrl });
|
||||||
validatedConfig = await AutoDiscoveryUtils.validateServerConfigWithStaticUrls(hsUrl, isUrl, true);
|
validatedConfig = await AutoDiscoveryUtils.validateServerConfigWithStaticUrls(hsUrl, isUrl, true);
|
||||||
} else {
|
} else {
|
||||||
// the user is not logged in, so scream
|
// the user is not logged in, so scream
|
||||||
|
@ -277,7 +277,7 @@ async function verifyServerConfig() {
|
||||||
|
|
||||||
// Add the newly built config to the actual config for use by the app
|
// Add the newly built config to the actual config for use by the app
|
||||||
console.log("Updating SdkConfig with validated discovery information");
|
console.log("Updating SdkConfig with validated discovery information");
|
||||||
SdkConfig.add({"validated_server_config": validatedConfig});
|
SdkConfig.add({ "validated_server_config": validatedConfig });
|
||||||
|
|
||||||
return SdkConfig.get();
|
return SdkConfig.get();
|
||||||
}
|
}
|
||||||
|
|
|
@ -55,7 +55,7 @@ function getConfig(configJsonFilename: string): Promise<{}> {
|
||||||
resolve({});
|
resolve({});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
reject({err: err, response: response});
|
reject({ err: err, response: response });
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -65,7 +65,7 @@ function getConfig(configJsonFilename: string): Promise<{}> {
|
||||||
// loading from the filesystem (see above).
|
// loading from the filesystem (see above).
|
||||||
resolve(JSON.parse(body));
|
resolve(JSON.parse(body));
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
reject({err: e});
|
reject({ err: e });
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
);
|
);
|
||||||
|
|
|
@ -26,7 +26,7 @@ require('highlight.js/styles/github.css');
|
||||||
require('katex/dist/katex.css');
|
require('katex/dist/katex.css');
|
||||||
|
|
||||||
// These are things that can run before the skin loads - be careful not to reference the react-sdk though.
|
// These are things that can run before the skin loads - be careful not to reference the react-sdk though.
|
||||||
import {parseQsFromFragment} from "./url_utils";
|
import { parseQsFromFragment } from "./url_utils";
|
||||||
import './modernizr';
|
import './modernizr';
|
||||||
|
|
||||||
async function settled(...promises: Array<Promise<any>>) {
|
async function settled(...promises: Array<Promise<any>>) {
|
||||||
|
|
|
@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
|
||||||
limitations under the License.
|
limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import {IndexedDBStoreWorker} from 'matrix-js-sdk/src/indexeddb-worker.js';
|
import { IndexedDBStoreWorker } from 'matrix-js-sdk/src/indexeddb-worker.js';
|
||||||
|
|
||||||
const remoteWorker = new IndexedDBStoreWorker(postMessage);
|
const remoteWorker = new IndexedDBStoreWorker(postMessage);
|
||||||
|
|
||||||
|
|
|
@ -31,10 +31,9 @@ import PWAPlatform from "./platform/PWAPlatform";
|
||||||
import WebPlatform from "./platform/WebPlatform";
|
import WebPlatform from "./platform/WebPlatform";
|
||||||
import PlatformPeg from "matrix-react-sdk/src/PlatformPeg";
|
import PlatformPeg from "matrix-react-sdk/src/PlatformPeg";
|
||||||
import SdkConfig from "matrix-react-sdk/src/SdkConfig";
|
import SdkConfig from "matrix-react-sdk/src/SdkConfig";
|
||||||
import {setTheme} from "matrix-react-sdk/src/theme";
|
import { setTheme } from "matrix-react-sdk/src/theme";
|
||||||
|
|
||||||
import {initRageshake, initRageshakeStore} from "./rageshakesetup";
|
|
||||||
|
|
||||||
|
import { initRageshake, initRageshakeStore } from "./rageshakesetup";
|
||||||
|
|
||||||
export const rageshakePromise = initRageshake();
|
export const rageshakePromise = initRageshake();
|
||||||
|
|
||||||
|
|
|
@ -18,7 +18,7 @@ limitations under the License.
|
||||||
require("./index.scss");
|
require("./index.scss");
|
||||||
|
|
||||||
import * as qs from 'querystring';
|
import * as qs from 'querystring';
|
||||||
import {KJUR} from 'jsrsasign';
|
import { KJUR } from 'jsrsasign';
|
||||||
import {
|
import {
|
||||||
IOpenIDCredentials,
|
IOpenIDCredentials,
|
||||||
IWidgetApiRequest,
|
IWidgetApiRequest,
|
||||||
|
@ -138,7 +138,7 @@ let meetApi: any; // JitsiMeetExternalAPI
|
||||||
});
|
});
|
||||||
widgetApi.transport.reply(ev.detail, {}); // ack
|
widgetApi.transport.reply(ev.detail, {}); // ack
|
||||||
} else {
|
} else {
|
||||||
widgetApi.transport.reply(ev.detail, {error: {message: "Conference not joined"}});
|
widgetApi.transport.reply(ev.detail, { error: { message: "Conference not joined" } });
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
);
|
);
|
||||||
|
@ -168,7 +168,7 @@ function switchVisibleContainers() {
|
||||||
*/
|
*/
|
||||||
function createJWTToken() {
|
function createJWTToken() {
|
||||||
// Header
|
// Header
|
||||||
const header = {alg: 'HS256', typ: 'JWT'};
|
const header = { alg: 'HS256', typ: 'JWT' };
|
||||||
// Payload
|
// Payload
|
||||||
const payload = {
|
const payload = {
|
||||||
// As per Jitsi token auth, `iss` needs to be set to something agreed between
|
// As per Jitsi token auth, `iss` needs to be set to something agreed between
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
import {getVectorConfig} from '../getconfig';
|
import { getVectorConfig } from '../getconfig';
|
||||||
|
|
||||||
function onBackToElementClick() {
|
function onBackToElementClick() {
|
||||||
// Cookie should expire in 4 hours
|
// Cookie should expire in 4 hours
|
||||||
|
|
|
@ -48,7 +48,7 @@ import React from "react";
|
||||||
import { randomString } from "matrix-js-sdk/src/randomstring";
|
import { randomString } from "matrix-js-sdk/src/randomstring";
|
||||||
import { Action } from "matrix-react-sdk/src/dispatcher/actions";
|
import { Action } from "matrix-react-sdk/src/dispatcher/actions";
|
||||||
import { ActionPayload } from "matrix-react-sdk/src/dispatcher/payloads";
|
import { ActionPayload } from "matrix-react-sdk/src/dispatcher/payloads";
|
||||||
import { SwitchSpacePayload} from "matrix-react-sdk/src/dispatcher/payloads/SwitchSpacePayload";
|
import { SwitchSpacePayload } from "matrix-react-sdk/src/dispatcher/payloads/SwitchSpacePayload";
|
||||||
import { showToast as showUpdateToast } from "matrix-react-sdk/src/toasts/UpdateToast";
|
import { showToast as showUpdateToast } from "matrix-react-sdk/src/toasts/UpdateToast";
|
||||||
import { CheckUpdatesPayload } from "matrix-react-sdk/src/dispatcher/payloads/CheckUpdatesPayload";
|
import { CheckUpdatesPayload } from "matrix-react-sdk/src/dispatcher/payloads/CheckUpdatesPayload";
|
||||||
import ToastStore from "matrix-react-sdk/src/stores/ToastStore";
|
import ToastStore from "matrix-react-sdk/src/stores/ToastStore";
|
||||||
|
@ -119,8 +119,8 @@ class SeshatIndexManager extends BaseEventIndexManager {
|
||||||
// TODO this should be moved into the preload.js file.
|
// TODO this should be moved into the preload.js file.
|
||||||
const ipcCallId = ++this.nextIpcCallId;
|
const ipcCallId = ++this.nextIpcCallId;
|
||||||
return new Promise((resolve, reject) => {
|
return new Promise((resolve, reject) => {
|
||||||
this.pendingIpcCalls[ipcCallId] = {resolve, reject};
|
this.pendingIpcCalls[ipcCallId] = { resolve, reject };
|
||||||
window.electron.send('seshat', {id: ipcCallId, name, args});
|
window.electron.send('seshat', { id: ipcCallId, name, args });
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -258,9 +258,9 @@ export default class ElectronPlatform extends VectorBasePlatform {
|
||||||
dis.fire(Action.ViewUserSettings);
|
dis.fire(Action.ViewUserSettings);
|
||||||
});
|
});
|
||||||
|
|
||||||
electron.on('userDownloadCompleted', (ev, {path, name}) => {
|
electron.on('userDownloadCompleted', (ev, { path, name }) => {
|
||||||
const onAccept = () => {
|
const onAccept = () => {
|
||||||
electron.send('userDownloadOpen', {path});
|
electron.send('userDownloadOpen', { path });
|
||||||
};
|
};
|
||||||
|
|
||||||
ToastStore.sharedInstance().addOrReplaceToast({
|
ToastStore.sharedInstance().addOrReplaceToast({
|
||||||
|
@ -326,7 +326,7 @@ export default class ElectronPlatform extends VectorBasePlatform {
|
||||||
return this._ipcCall('getConfig');
|
return this._ipcCall('getConfig');
|
||||||
}
|
}
|
||||||
|
|
||||||
onUpdateDownloaded = async (ev, {releaseNotes, releaseName}) => {
|
onUpdateDownloaded = async (ev, { releaseNotes, releaseName }) => {
|
||||||
dis.dispatch<CheckUpdatesPayload>({
|
dis.dispatch<CheckUpdatesPayload>({
|
||||||
action: Action.CheckUpdates,
|
action: Action.CheckUpdates,
|
||||||
status: UpdateCheckStatus.Ready,
|
status: UpdateCheckStatus.Ready,
|
||||||
|
@ -497,8 +497,8 @@ export default class ElectronPlatform extends VectorBasePlatform {
|
||||||
async _ipcCall(name: string, ...args: any[]): Promise<any> {
|
async _ipcCall(name: string, ...args: any[]): Promise<any> {
|
||||||
const ipcCallId = ++this.nextIpcCallId;
|
const ipcCallId = ++this.nextIpcCallId;
|
||||||
return new Promise((resolve, reject) => {
|
return new Promise((resolve, reject) => {
|
||||||
this.pendingIpcCalls[ipcCallId] = {resolve, reject};
|
this.pendingIpcCalls[ipcCallId] = { resolve, reject };
|
||||||
window.electron.send('ipcCall', {id: ipcCallId, name, args});
|
window.electron.send('ipcCall', { id: ipcCallId, name, args });
|
||||||
// Maybe add a timeout to these? Probably not necessary.
|
// Maybe add a timeout to these? Probably not necessary.
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
|
@ -18,8 +18,8 @@ limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import BasePlatform from 'matrix-react-sdk/src/BasePlatform';
|
import BasePlatform from 'matrix-react-sdk/src/BasePlatform';
|
||||||
import {_t} from 'matrix-react-sdk/src/languageHandler';
|
import { _t } from 'matrix-react-sdk/src/languageHandler';
|
||||||
import {getVectorConfig} from "../getconfig";
|
import { getVectorConfig } from "../getconfig";
|
||||||
|
|
||||||
import Favicon from "../../favicon";
|
import Favicon from "../../favicon";
|
||||||
|
|
||||||
|
|
|
@ -17,13 +17,13 @@ limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import VectorBasePlatform from './VectorBasePlatform';
|
import VectorBasePlatform from './VectorBasePlatform';
|
||||||
import {UpdateCheckStatus} from "matrix-react-sdk/src/BasePlatform";
|
import { UpdateCheckStatus } from "matrix-react-sdk/src/BasePlatform";
|
||||||
import request from 'browser-request';
|
import request from 'browser-request';
|
||||||
import dis from 'matrix-react-sdk/src/dispatcher/dispatcher';
|
import dis from 'matrix-react-sdk/src/dispatcher/dispatcher';
|
||||||
import {_t} from 'matrix-react-sdk/src/languageHandler';
|
import { _t } from 'matrix-react-sdk/src/languageHandler';
|
||||||
import {Room} from "matrix-js-sdk/src/models/room";
|
import { Room } from "matrix-js-sdk/src/models/room";
|
||||||
import {hideToast as hideUpdateToast, showToast as showUpdateToast} from "matrix-react-sdk/src/toasts/UpdateToast";
|
import { hideToast as hideUpdateToast, showToast as showUpdateToast } from "matrix-react-sdk/src/toasts/UpdateToast";
|
||||||
import {Action} from "matrix-react-sdk/src/dispatcher/actions";
|
import { Action } from "matrix-react-sdk/src/dispatcher/actions";
|
||||||
import { CheckUpdatesPayload } from 'matrix-react-sdk/src/dispatcher/payloads/CheckUpdatesPayload';
|
import { CheckUpdatesPayload } from 'matrix-react-sdk/src/dispatcher/payloads/CheckUpdatesPayload';
|
||||||
|
|
||||||
import UAParser from 'ua-parser-js';
|
import UAParser from 'ua-parser-js';
|
||||||
|
|
Loading…
Reference in a new issue