PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Merge pull request #15064 from vector-im/t3chguy/lint-ts

Browse source 
Fix eslint ts override tsx matching and delint
This commit is contained in:
Michael Telatynski 2020-09-01 09:10:48 +01:00 committed by GitHub
commit 7bdb8104dc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 21 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.eslintrc.js
View file

@ -8,7 +8,7 @@ module.exports = {
"quotes": "off", "quotes": "off",
}, },
"overrides": [{ "overrides": [{
"files": ["src/**/*.{ts, tsx}"], "files": ["src/**/*.{ts,tsx}"],
"extends": ["matrix-org/ts", "matrix-org/react"], "extends": ["matrix-org/ts", "matrix-org/react"],
"env": { "env": {
"browser": true, "browser": true,

21
src/async-components/structures/CompatibilityView.tsx
View file

@ -78,17 +78,26 @@ const CompatibilityView: React.FC<IProps> = ({ onAccept }) => {
<div> <div>
<h2 id="step2_heading">Use Element on mobile</h2> <h2 id="step2_heading">Use Element on mobile</h2>
<p><strong>iOS</strong> (iPhone or iPad)</p> <p><strong>iOS</strong> (iPhone or iPad)</p>
<a href="https://apps.apple.com/app/vector/id1083446067" target="_blank" <a
className="mx_ClearDecoration"> href="https://apps.apple.com/app/vector/id1083446067"
target="_blank"
className="mx_ClearDecoration"
>
<img height="48" src="themes/element/img/download/apple.svg" alt="Apple App Store" /> <img height="48" src="themes/element/img/download/apple.svg" alt="Apple App Store" />
</a> </a>
<p className="mx_Spacer"><strong>Android</strong></p> <p className="mx_Spacer"><strong>Android</strong></p>
<a href="https://play.google.com/store/apps/details?id=im.vector.app" target="_blank" <a
className="mx_ClearDecoration"> href="https://play.google.com/store/apps/details?id=im.vector.app"
target="_blank"
className="mx_ClearDecoration"
>
<img height="48" src="themes/element/img/download/google.svg" alt="Google Play Store" /> <img height="48" src="themes/element/img/download/google.svg" alt="Google Play Store" />
</a> </a>
<a href="https://f-droid.org/repository/browse/?fdid=im.vector.app" target="_blank" <a
className="mx_ClearDecoration"> href="https://f-droid.org/repository/browse/?fdid=im.vector.app"
target="_blank"
className="mx_ClearDecoration"
>
<img height="48" src="themes/element/img/download/fdroid.svg" alt="F-Droid" /> <img height="48" src="themes/element/img/download/fdroid.svg" alt="F-Droid" />
</a> </a>
</div> </div>

2
src/vector/init.tsx
View file

@ -17,6 +17,7 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-ignore // @ts-ignore
import olmWasmPath from "olm/olm.wasm"; import olmWasmPath from "olm/olm.wasm";
import Olm from 'olm'; import Olm from 'olm';
@ -127,6 +128,7 @@ export async function loadSkin() {
import( import(
/* webpackChunkName: "riot-web-component-index" */ /* webpackChunkName: "riot-web-component-index" */
/* webpackPreload: true */ /* webpackPreload: true */
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-ignore - this module is generated so may fail lint // @ts-ignore - this module is generated so may fail lint
"../component-index"), "../component-index"),
]); ]);

6
src/vector/platform/ElectronPlatform.tsx
View file

@ -27,7 +27,7 @@ import BaseEventIndexManager, {
MatrixEvent, MatrixEvent,
MatrixProfile, MatrixProfile,
SearchArgs, SearchArgs,
SearchResult SearchResult,
} from 'matrix-react-sdk/src/indexing/BaseEventIndexManager'; } from 'matrix-react-sdk/src/indexing/BaseEventIndexManager';
import dis from 'matrix-react-sdk/src/dispatcher/dispatcher'; import dis from 'matrix-react-sdk/src/dispatcher/dispatcher';
import {_t, _td} from 'matrix-react-sdk/src/languageHandler'; import {_t, _td} from 'matrix-react-sdk/src/languageHandler';
@ -99,7 +99,7 @@ interface IPCPayload {
class SeshatIndexManager extends BaseEventIndexManager { class SeshatIndexManager extends BaseEventIndexManager {
private pendingIpcCalls: Record<number, { resolve, reject }> = {}; private pendingIpcCalls: Record<number, { resolve, reject }> = {};
private nextIpcCallId: number = 0; private nextIpcCallId = 0;
constructor() { constructor() {
super(); super();
@ -216,7 +216,7 @@ class SeshatIndexManager extends BaseEventIndexManager {
export default class ElectronPlatform extends VectorBasePlatform { export default class ElectronPlatform extends VectorBasePlatform {
private eventIndexManager: BaseEventIndexManager = new SeshatIndexManager(); private eventIndexManager: BaseEventIndexManager = new SeshatIndexManager();
private pendingIpcCalls: Record<number, { resolve, reject }> = {}; private pendingIpcCalls: Record<number, { resolve, reject }> = {};
private nextIpcCallId: number = 0; private nextIpcCallId = 0;
// this is the opaque token we pass to the HS which when we get it in our callback we can resolve to a profile // this is the opaque token we pass to the HS which when we get it in our callback we can resolve to a profile
private ssoID: string = randomString(32); private ssoID: string = randomString(32);