Skip to content

Commit

Permalink
Fix codes by tslint rules
Browse files Browse the repository at this point in the history
  • Loading branch information
HyunSangHan committed Apr 19, 2020
1 parent 4eca7d3 commit 0d81174
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 14 deletions.
2 changes: 1 addition & 1 deletion package.json
Expand Up @@ -52,7 +52,7 @@
"webpack-cli": "^3.3.10"
},
"lint-staged": {
"*.ts": "eslint --fix"
"*.ts": "tslint --fix"
},
"husky": {
"hooks": {
Expand Down
18 changes: 10 additions & 8 deletions src/background/customizeURL.ts
Expand Up @@ -85,25 +85,27 @@ const serviceDomains: object = {
}
};

export const syncIgnore: Array<string> = ["https://m.vlive.tv/events"];
export const syncIgnore: string[] = ["https://m.vlive.tv/events"];

const parseURL = (url: string): Array<string> => {
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<string> = parseURL(url);
const parsedURLInfo: string[] = parseURL(url);
let replacedURL: string = url;
if (parsedURLInfo) {
const [service, from, to]: Array<string> = parsedURLInfo;
const [service, from, to]: string[] = parsedURLInfo;
if (isFromSidebar && to === "mobile") {
replacedURL = url;
} else if (!isFromSidebar && to === "desktop") {
Expand Down
6 changes: 3 additions & 3 deletions src/background/index.ts
Expand Up @@ -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 => {
Expand Down Expand Up @@ -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 => {
Expand All @@ -88,7 +88,7 @@ const syncToMobile = (url: string): void => {
}
};

const toggleBadge = (isSyncOn: boolean): void => {
const toggleBadge = (): void => {
if (isSyncOn) {
sidebarAction.setTitle({
title: `Browser Sync 켜짐`
Expand Down
2 changes: 1 addition & 1 deletion src/contentScript/index.ts
Expand Up @@ -21,7 +21,7 @@ window.onload = (e: any) => {
}
});
})
.catch(e => console.log(e));
.catch(err => console.log(err));
};

window.onhashchange = (e: any) => {
Expand Down
6 changes: 5 additions & 1 deletion tslint.json
@@ -1,3 +1,7 @@
{
"extends": "tslint:recommended"
"extends": "tslint:recommended",
"rules": {
"no-unused-expression": [false, "allowShortCircuit"],
"no-console": false
}
}

0 comments on commit 0d81174

Please sign in to comment.