From b861c4a7b4bc9cd09180278ab07dcc937309132d Mon Sep 17 00:00:00 2001 From: James George Date: Wed, 18 Sep 2019 14:32:54 +0530 Subject: [PATCH 1/4] chore: minor code refactor --- build.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.js b/build.js index e16304317..18a8b9608 100644 --- a/build.js +++ b/build.js @@ -39,7 +39,7 @@ try { runCommand("git", ["branch"]) .split("* ")[1] .split(" ")[0] + (IS_DEV_MODE ? " - DEV MODE" : ""); - if (version.variant === "" || version.variant === "master") + if (["", "master].includes(version.variant)) delete version.variant; // Write version data into a file From e4db91e35bcaa1c0a253691d0074acbeb9aa622b Mon Sep 17 00:00:00 2001 From: James George Date: Wed, 18 Sep 2019 14:40:27 +0530 Subject: [PATCH 2/4] fix typo --- build.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.js b/build.js index 18a8b9608..fec57b032 100644 --- a/build.js +++ b/build.js @@ -39,7 +39,7 @@ try { runCommand("git", ["branch"]) .split("* ")[1] .split(" ")[0] + (IS_DEV_MODE ? " - DEV MODE" : ""); - if (["", "master].includes(version.variant)) + if (["", "master"].includes(version.variant)) delete version.variant; // Write version data into a file From d1a2786c7cc3f3c935379dc9534d5524d461f69c Mon Sep 17 00:00:00 2001 From: jamesgeorge007 Date: Wed, 18 Sep 2019 15:10:44 +0530 Subject: [PATCH 3/4] refactor --- pages/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/index.vue b/pages/index.vue index 0aee73ea4..2aa24b90f 100644 --- a/pages/index.vue +++ b/pages/index.vue @@ -517,7 +517,7 @@ value }) => `${key}=${value}`).join('&') queryString = queryString === '' ? '' : `?${queryString}` - if(path.indexOf('?') !== -1) { + if(path.includes('?')) { path = path.slice(0, path.indexOf('?')) + queryString; } else { path = path + queryString From 3ecc170fd21aeda366eaee9899aa01b6c6daa2e1 Mon Sep 17 00:00:00 2001 From: jamesgeorge007 Date: Wed, 18 Sep 2019 15:16:56 +0530 Subject: [PATCH 4/4] minor refactor --- assets/js/curlparser.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/assets/js/curlparser.js b/assets/js/curlparser.js index 710e92f7b..be4386ce1 100644 --- a/assets/js/curlparser.js +++ b/assets/js/curlparser.js @@ -40,7 +40,7 @@ function parseCurlCommand(curlCommand) { if (!url) { for (let argName in parsedArguments) { if (typeof parsedArguments[argName] === 'string') { - if (parsedArguments[argName].indexOf('http') === 0 || parsedArguments[argName].indexOf('www.') === 0) { + if (['http', 'www.'].includes(parsedArguments[argName])) { url = parsedArguments[argName]; } } @@ -57,7 +57,7 @@ function parseCurlCommand(curlCommand) { parsedArguments[headerFieldName] = [parsedArguments[headerFieldName]]; } parsedArguments[headerFieldName].forEach(function(header) { - if (header.indexOf('Cookie') !== -1) { + if (header.includes('Cookie')) { // stupid javascript tricks: closure cookieString = header; } else { @@ -149,7 +149,7 @@ function parseCurlCommand(curlCommand) { if (option) { let urlQueryString = ''; - if (url.indexOf('?') < 0) { + if (!url.includes('?')) { url += '?'; } else { urlQueryString += '&';