diff --git a/package.json b/package.json index c5b8d35..cf3c40c 100644 --- a/package.json +++ b/package.json @@ -52,7 +52,7 @@ "webpack-cli": "^3.3.10" }, "lint-staged": { - "*.ts": "eslint --fix" + "*.ts": "tslint --fix" }, "husky": { "hooks": { diff --git a/src/background/customizeURL.ts b/src/background/customizeURL.ts index 0f04091..8c2be9d 100644 --- a/src/background/customizeURL.ts +++ b/src/background/customizeURL.ts @@ -85,25 +85,27 @@ const serviceDomains: object = { } }; -export const syncIgnore: Array = ["https://m.vlive.tv/events"]; +export const syncIgnore: string[] = ["https://m.vlive.tv/events"]; -const parseURL = (url: string): Array => { +const parseURL = (url: string): string[] => { if (url) { const parsedHost = url.split("/")[2]; for (const service in serviceDomains) { - if (serviceDomains[service]["desktopHost"] === parsedHost) - return [service, "desktop", "mobile"]; // from desktop to mobile - if (serviceDomains[service]["mobileHost"] === parsedHost) - return [service, "mobile", "desktop"]; // from mobile to desktop + if (serviceDomains.hasOwnProperty(service)) { + if (serviceDomains[service][`desktopHost`] === parsedHost) + return [service, "desktop", "mobile"]; // from desktop to mobile + if (serviceDomains[service][`mobileHost`] === parsedHost) + return [service, "mobile", "desktop"]; // from mobile to desktop + } } } }; const customizeURL = (url: string, isFromSidebar: boolean): string => { - const parsedURLInfo: Array = parseURL(url); + const parsedURLInfo: string[] = parseURL(url); let replacedURL: string = url; if (parsedURLInfo) { - const [service, from, to]: Array = parsedURLInfo; + const [service, from, to]: string[] = parsedURLInfo; if (isFromSidebar && to === "mobile") { replacedURL = url; } else if (!isFromSidebar && to === "desktop") { diff --git a/src/background/index.ts b/src/background/index.ts index a26a33a..ce839c8 100644 --- a/src/background/index.ts +++ b/src/background/index.ts @@ -13,7 +13,7 @@ let sidebarTabId: number = null; sidebarAction.onClicked.addListener((result: any): void => { isSyncOn = result.opened; - toggleBadge(isSyncOn); + toggleBadge(); if (isSyncOn) { tabs.getSelected(null, (tab: any): void => { @@ -68,7 +68,7 @@ tabs.onUpdated.addListener((tabId, { url }): void => { }); const syncToDesktop = (url: string): void => { - tabs.update({ url: url, active: true }); + tabs.update({ url, active: true }); }; const syncToMobile = (url: string): void => { @@ -88,7 +88,7 @@ const syncToMobile = (url: string): void => { } }; -const toggleBadge = (isSyncOn: boolean): void => { +const toggleBadge = (): void => { if (isSyncOn) { sidebarAction.setTitle({ title: `Browser Sync 켜짐` diff --git a/src/contentScript/index.ts b/src/contentScript/index.ts index 5d3ce63..e7105ae 100644 --- a/src/contentScript/index.ts +++ b/src/contentScript/index.ts @@ -21,7 +21,7 @@ window.onload = (e: any) => { } }); }) - .catch(e => console.log(e)); + .catch(err => console.log(err)); }; window.onhashchange = (e: any) => { diff --git a/tslint.json b/tslint.json index f7bb7a7..4e3cb86 100644 --- a/tslint.json +++ b/tslint.json @@ -1,3 +1,7 @@ { - "extends": "tslint:recommended" + "extends": "tslint:recommended", + "rules": { + "no-unused-expression": [false, "allowShortCircuit"], + "no-console": false + } }