Switch to eslint and fix issues

This commit is contained in:
hensm
2021-04-26 05:36:55 +01:00
parent 2d0fa4c844
commit d478742c4b
100 changed files with 1537 additions and 608 deletions

View File

@@ -20,20 +20,20 @@ const _ = browser.i18n.getMessage;
// TODO: Figure out lifetime properly
export default class NativeReceiverSelector extends ReceiverSelector {
private bridgePort: (Port | null) = null;
private wasReceiverSelected: boolean = false;
private wasReceiverSelected = false;
#isOpen = false;
constructor () {
constructor() {
super();
this.onBridgePortMessage = this.onBridgePortMessage.bind(this);
}
get isOpen () {
get isOpen() {
return this.#isOpen;
}
public async open (
public async open(
receivers: Receiver[]
, defaultMediaType: ReceiverSelectorMediaType
, availableMediaTypes: ReceiverSelectorMediaType
@@ -86,11 +86,11 @@ export default class NativeReceiverSelector extends ReceiverSelector {
this.#isOpen = true;
}
public update (): void {
public update(): void {
// TODO: Implement this
}
public close (): void {
public close(): void {
if (this.bridgePort) {
this.bridgePort.postMessage({
subject: "bridge:closeReceiverSelector"
@@ -100,7 +100,7 @@ export default class NativeReceiverSelector extends ReceiverSelector {
this.#isOpen = false;
}
private async onBridgePortMessage (message: Message) {
private async onBridgePortMessage(message: Message) {
switch (message.subject) {
case "main:receiverSelector/selected": {
this.wasReceiverSelected = true;

View File

@@ -24,13 +24,13 @@ export default class PopupReceiverSelector extends ReceiverSelector {
private defaultMediaType?: ReceiverSelectorMediaType;
private availableMediaTypes?: ReceiverSelectorMediaType;
private wasReceiverSelected: boolean = false;
private wasReceiverSelected = false;
private appId?: string;
#isOpen = false;
constructor () {
constructor() {
super();
// Bind methods to pass to addListener
@@ -48,11 +48,11 @@ export default class PopupReceiverSelector extends ReceiverSelector {
messaging.onConnect.addListener(this.onConnect);
}
get isOpen () {
get isOpen() {
return this.#isOpen;
}
public async open (
public async open(
receivers: Receiver[]
, defaultMediaType: ReceiverSelectorMediaType
, availableMediaTypes: ReceiverSelectorMediaType
@@ -115,7 +115,7 @@ export default class PopupReceiverSelector extends ReceiverSelector {
}
}
public update (receivers: Receiver[]) {
public update(receivers: Receiver[]) {
this.receivers = receivers;
this.messagePort?.postMessage({
subject: "popup:update"
@@ -125,7 +125,7 @@ export default class PopupReceiverSelector extends ReceiverSelector {
});
}
public async close (): Promise<void> {
public async close(): Promise<void> {
if (this.windowId) {
await browser.windows.remove(this.windowId);
}
@@ -138,7 +138,7 @@ export default class PopupReceiverSelector extends ReceiverSelector {
}
}
private onConnect (port: Port) {
private onConnect(port: Port) {
browser.history.deleteUrl({ url: POPUP_URL });
if (port.name !== "popup") {
@@ -181,7 +181,7 @@ export default class PopupReceiverSelector extends ReceiverSelector {
/**
* Handles popup messages.
*/
private onPopupMessage (message: Message) {
private onPopupMessage(message: Message) {
switch (message.subject) {
case "receiverSelector:selected": {
this.wasReceiverSelected = true;
@@ -206,7 +206,7 @@ export default class PopupReceiverSelector extends ReceiverSelector {
* Handles cancellation state where the popup window is closed
* before a receiver is selected.
*/
private onWindowsRemoved (windowId: number) {
private onWindowsRemoved(windowId: number) {
// Only care about popup window
if (windowId !== this.windowId) {
return;
@@ -234,7 +234,7 @@ export default class PopupReceiverSelector extends ReceiverSelector {
* into focus. Doesn't apply if no window is focused
* `WINDOW_ID_NONE` or if the popup window is re-focused.
*/
private onWindowsFocusChanged (windowId: number) {
private onWindowsFocusChanged(windowId: number) {
if (windowId !== browser.windows.WINDOW_ID_NONE
&& windowId !== this.windowId) {

View File

@@ -18,7 +18,7 @@ import NativeReceiverSelector from "./NativeReceiverSelector";
import PopupReceiverSelector from "./PopupReceiverSelector";
async function createSelector () {
async function createSelector() {
const type = await options.get("receiverSelectorType");
const platformInfo = await browser.runtime.getPlatformInfo();
@@ -33,7 +33,7 @@ async function createSelector () {
let sharedSelector: ReceiverSelector;
async function getSelector () {
async function getSelector() {
if (!sharedSelector) {
try {
sharedSelector = await createSelector();
@@ -56,7 +56,7 @@ async function getSelector () {
* - Resolves to null if the selection is cancelled.
* - Rejects if the selection fails.
*/
async function getSelection (
async function getSelection(
contextTabId: number
, contextFrameId = 0
, withMediaSender = false)
@@ -119,7 +119,7 @@ async function getSelection (
sharedSelector = await createSelector();
function onReceiverChange () {
function onReceiverChange() {
sharedSelector.update(Array.from(StatusManager.getReceivers()));
}
@@ -136,7 +136,7 @@ async function getSelection (
type EvParamsType =
Parameters<typeof sharedSelector.addEventListener>[0];
function storeListener<T> (type: EvParamsType, fn: T) {
function storeListener<T>(type: EvParamsType, fn: T) {
if (type === "selected") {
onSelected = fn;
} else if (type === "cancelled") {
@@ -150,7 +150,7 @@ async function getSelection (
return fn;
}
function removeListeners () {
function removeListeners() {
sharedSelector.removeEventListener("selected", onSelected);
sharedSelector.removeEventListener("cancelled", onCancelled);
sharedSelector.removeEventListener("error", onError);