TSLint compliance

This commit is contained in:
hensm
2019-05-02 01:23:43 +01:00
committed by Matt Hensman
parent 95d9d846c5
commit 8ad20a7aea
11 changed files with 32 additions and 36 deletions

View File

@@ -1,9 +1,9 @@
"use strict"; "use strict";
import EventEmitter from "events";
import fs from "fs"; import fs from "fs";
import http from "http"; import http from "http";
import mime from "mime-types"; import mime from "mime-types";
import EventEmitter from "events";
import { Message import { Message
, SendMessageCallback } from "./types"; , SendMessageCallback } from "./types";

View File

@@ -7,15 +7,15 @@ export interface ReceiverStatus {
controlType: string; controlType: string;
level: number; level: number;
}; };
applications?: { applications?: Array<{
displayName: string; displayName: string;
statusText: string; statusText: string;
transportId: string; transportId: string;
isIdleScreen: boolean; isIdleScreen: boolean;
sessionId: string; sessionId: string;
namespaces: { name: string }[]; namespaces: Array<{ name: string }>;
appId: string; appId: string;
}[]; }>;
userEq?: {}; userEq?: {};
} }
@@ -33,7 +33,7 @@ export interface MediaStatus {
volume: { volume: {
muted: boolean; muted: boolean;
level: number; level: number;
} };
currentItemId: number; currentItemId: number;
idleReason: string; idleReason: string;
playerState: string; playerState: string;
@@ -44,11 +44,11 @@ export interface MediaStatus {
streamType: string; streamType: string;
contentType: string; contentType: string;
metadata: { metadata: {
images: { url: string }[]; images: Array<{ url: string }>;
metadataType: number; metadataType: number;
artist: string; artist: string;
title: string; title: string;
}; };
} }
} };
} }

View File

@@ -13,7 +13,7 @@ import Session from "./Session";
import StatusListener from "./StatusListener"; import StatusListener from "./StatusListener";
import * as transforms from "./transforms"; import * as transforms from "./transforms";
import { ReceiverStatus, MediaStatus } from "./castTypes"; import { MediaStatus, ReceiverStatus } from "./castTypes";
import { Message } from "./types"; import { Message } from "./types";
@@ -145,7 +145,7 @@ async function handleMessage (message: Message) {
try { try {
JSON.parse(receiverSelectorData); JSON.parse(receiverSelectorData);
} catch (err) { } catch (err) {
console.error("Invalid native selector data.") console.error("Invalid native selector data.");
} }
} }
@@ -153,19 +153,19 @@ async function handleMessage (message: Message) {
path.join(process.cwd(), "selector") path.join(process.cwd(), "selector")
, [ receiverSelectorData ]); , [ receiverSelectorData ]);
receiverSelectorApp.stdout.setEncoding("utf8") receiverSelectorApp.stdout.setEncoding("utf8");
receiverSelectorApp.stdout.on("data", data => { receiverSelectorApp.stdout.on("data", data => {
sendMessage({ sendMessage({
subject: "main:/receiverSelector/selected" subject: "main:/receiverSelector/selected"
, data: JSON.parse(data) , data: JSON.parse(data)
}) });
}); });
receiverSelectorApp.addListener("error", err => { receiverSelectorApp.addListener("error", err => {
sendMessage({ sendMessage({
subject: "main:/receiverSelector/error" subject: "main:/receiverSelector/error"
, data: err.message , data: err.message
}) });
}); });
receiverSelectorApp.on("close", () => { receiverSelectorApp.on("close", () => {
@@ -199,7 +199,7 @@ async function handleMessage (message: Message) {
sendMessage({ sendMessage({
subject: "mediaCast:/mediaServer/stopped" subject: "mediaCast:/mediaServer/stopped"
}); });
}) });
break; break;
} }

View File

@@ -5,8 +5,8 @@
] ]
, "jsRules": false , "jsRules": false
, "rules": { , "rules": {
"no-consecutive-blank-lines": false "arrow-parens": false
, "arrow-parens": false , "import-spacing": false
, "interface-name": false , "interface-name": false
, "max-classes-per-file": false , "max-classes-per-file": false
, "max-line-length": [ true, { , "max-line-length": [ true, {
@@ -14,6 +14,7 @@
, "ignore-pattern": "//|.*(\"|`);?$" , "ignore-pattern": "//|.*(\"|`);?$"
}] }]
, "member-access": [ true ] , "member-access": [ true ]
, "no-consecutive-blank-lines": false
, "no-console": [ true, "log" ] , "no-console": [ true, "log" ]
, "no-namespace": [ true, "allow-declarations" ] , "no-namespace": [ true, "allow-declarations" ]
, "object-literal-sort-keys": false , "object-literal-sort-keys": false

2
ext/src/global.d.ts vendored
View File

@@ -59,7 +59,7 @@ declare namespace browser.runtime {
* https://git.io/fjmzb * https://git.io/fjmzb
* addListener cb `() => void` is wrong * addListener cb `() => void` is wrong
*/ */
onMessage: browser.events.Event onMessage: browser.events.Event;
} }
function connect (connectInfo: { function connect (connectInfo: {

View File

@@ -8,7 +8,7 @@ export interface ReceiverStatusMessage extends Message {
data: { data: {
id: string; id: string;
status: ReceiverStatus; status: ReceiverStatus;
} };
} }
export interface ServiceDownMessage extends Message { export interface ServiceDownMessage extends Message {
@@ -25,16 +25,16 @@ export interface ServiceUpMessage extends Message {
export interface NativeReceiverSelectorSelectedMessage extends Message { export interface NativeReceiverSelectorSelectedMessage extends Message {
subject: "main:/receiverSelector/selected" subject: "main:/receiverSelector/selected";
, data: Receiver data: Receiver;
} }
export interface NativeReceiverSelectorCloseMessage extends Message { export interface NativeReceiverSelectorCloseMessage extends Message {
subject: "main:/receiverSelector/error" subject: "main:/receiverSelector/error";
, data: string data: string;
} }
export interface NativeReceiverSelectorErrorMessage extends Message { export interface NativeReceiverSelectorErrorMessage extends Message {
subject: "main:/receiverSelector/error" subject: "main:/receiverSelector/error";
, data: string data: string;
} }

View File

@@ -18,7 +18,7 @@ export enum ReceiverSelectorManagerType {
, NativeMac , NativeMac
} }
export function getReceiverSelectorManager( export function getReceiverSelectorManager (
type: ReceiverSelectorManagerType) { type: ReceiverSelectorManagerType) {
switch (type) { switch (type) {

View File

@@ -5,9 +5,9 @@ import ReceiverSelectorManager, {
import { Message, Receiver } from "../../types"; import { Message, Receiver } from "../../types";
import { NativeReceiverSelectorSelectedMessage import { NativeReceiverSelectorCloseMessage
, NativeReceiverSelectorErrorMessage , NativeReceiverSelectorErrorMessage
, NativeReceiverSelectorCloseMessage } from "../../messageTypes"; , NativeReceiverSelectorSelectedMessage } from "../../messageTypes";
const _ = browser.i18n.getMessage; const _ = browser.i18n.getMessage;

View File

@@ -54,7 +54,7 @@ class PopupReceiverSelectorManager
receivers: this.receivers receivers: this.receivers
, defaultMediaType: this.defaultMediaType , defaultMediaType: this.defaultMediaType
} }
}) });
}); });
} }
@@ -103,8 +103,6 @@ class PopupReceiverSelectorManager
* Handles popup messages. * Handles popup messages.
*/ */
private onPopupMessage (message: Message) { private onPopupMessage (message: Message) {
console.log("popupmsg", message);
switch (message.subject) { switch (message.subject) {
case "receiverSelectorManager:/selected": { case "receiverSelectorManager:/selected": {
this.wasReceiverSelected = true; this.wasReceiverSelected = true;

View File

@@ -190,11 +190,9 @@ export function unescape (escaped: string): string {
onMessage(async message => { onMessage(async message => {
console.log(message)
switch (message.subject) { switch (message.subject) {
case "shim:/initialized": { case "shim:/initialized": {
isAvailable = true; isAvailable = true;
break; break;
} }

View File

@@ -86,13 +86,13 @@ class PopupApp extends Component<{}, PopupAppState> {
browser.windows.update(this.win.id, { browser.windows.update(this.win.id, {
height: windowHeight height: windowHeight
}); });
}, 1) }, 1);
} }
public render () { public render () {
const shareMedia = const shareMedia =
this.state.mediaType === ReceiverSelectorMediaType.Tab this.state.mediaType === ReceiverSelectorMediaType.Tab
|| this.state.mediaType === ReceiverSelectorMediaType.Screen || this.state.mediaType === ReceiverSelectorMediaType.Screen;
return ( return (
<div> <div>
@@ -103,7 +103,6 @@ class PopupApp extends Component<{}, PopupAppState> {
className="media-select-dropdown"> className="media-select-dropdown">
<option value={ ReceiverSelectorMediaType.App } <option value={ ReceiverSelectorMediaType.App }
disabled={ shareMedia }> disabled={ shareMedia }>
{ _("popupMediaTypeApp") } { _("popupMediaTypeApp") }
</option> </option>
<option value={ ReceiverSelectorMediaType.Tab } <option value={ ReceiverSelectorMediaType.Tab }