Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ESLint configuration change with linting corrections. #899

Merged
merged 3 commits into from
Nov 14, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
"block-spacing": "error",
"array-bracket-spacing": "error",
"comma-spacing": "error",
"spaced-comment": ["error", "always", { "exceptions": ["/"] } ],
"comma-style": "error",
"computed-property-spacing": "error",
"no-trailing-spaces": "warn",
Expand Down
14 changes: 7 additions & 7 deletions src/core/Utils.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -758,15 +758,15 @@ class Utils {
"%7E": "~",
"%21": "!",
"%24": "$",
//"%26": "&",
// "%26": "&",
"%27": "'",
"%28": "(",
"%29": ")",
"%2A": "*",
//"%2B": "+",
// "%2B": "+",
"%2C": ",",
"%3B": ";",
//"%3D": "=",
// "%3D": "=",
"%3A": ":",
"%40": "@",
"%2F": "/",
Expand Down Expand Up @@ -1335,14 +1335,14 @@ export function debounce(func, wait, id, scope, args) {
// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/padStart
if (!String.prototype.padStart) {
String.prototype.padStart = function padStart(targetLength, padString) {
targetLength = targetLength>>0; //floor if number or convert non-number to 0;
targetLength = targetLength>>0; // floor if number or convert non-number to 0;
padString = String((typeof padString !== "undefined" ? padString : " "));
if (this.length > targetLength) {
return String(this);
} else {
targetLength = targetLength-this.length;
if (targetLength > padString.length) {
padString += padString.repeat(targetLength/padString.length); //append to original to ensure we are longer than needed
padString += padString.repeat(targetLength/padString.length); // append to original to ensure we are longer than needed
}
return padString.slice(0, targetLength) + String(this);
}
Expand All @@ -1354,14 +1354,14 @@ if (!String.prototype.padStart) {
// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/padEnd
if (!String.prototype.padEnd) {
String.prototype.padEnd = function padEnd(targetLength, padString) {
targetLength = targetLength>>0; //floor if number or convert non-number to 0;
targetLength = targetLength>>0; // floor if number or convert non-number to 0;
padString = String((typeof padString !== "undefined" ? padString : " "));
if (this.length > targetLength) {
return String(this);
} else {
targetLength = targetLength-this.length;
if (targetLength > padString.length) {
padString += padString.repeat(targetLength/padString.length); //append to original to ensure we are longer than needed
padString += padString.repeat(targetLength/padString.length); // append to original to ensure we are longer than needed
}
return String(this) + padString.slice(0, targetLength);
}
Expand Down
2 changes: 1 addition & 1 deletion src/core/config/scripts/generateConfig.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
* @license Apache-2.0
*/

/*eslint no-console: ["off"] */
/* eslint no-console: ["off"] */

import path from "path";
import fs from "fs";
Expand Down
2 changes: 1 addition & 1 deletion src/core/config/scripts/generateOpsIndex.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
* @license Apache-2.0
*/

/*eslint no-console: ["off"] */
/* eslint no-console: ["off"] */

import path from "path";
import fs from "fs";
Expand Down
4 changes: 2 additions & 2 deletions src/core/config/scripts/newOperation.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* @license Apache-2.0
*/

/*eslint no-console: ["off"] */
/* eslint no-console: ["off"] */

import prompt from "prompt";
import colors from "colors";
Expand Down Expand Up @@ -208,7 +208,7 @@ ${result.highlight ? `
export default ${moduleName};
`;

//console.log(template);
// console.log(template);

const filename = path.join(dir, `./${moduleName}.mjs`);
if (fs.existsSync(filename)) {
Expand Down
2 changes: 1 addition & 1 deletion src/core/operations/FromMorseCode.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ class FromMorseCode extends Operation {
const letterDelim = Utils.charRep(args[0]);
const wordDelim = Utils.charRep(args[1]);

input = input.replace(/-|‐|−|_|–|—|dash/ig, "<dash>"); //hyphen-minus|hyphen|minus-sign|undersore|en-dash|em-dash
input = input.replace(/-|‐|−|_|–|—|dash/ig, "<dash>"); // hyphen-minus|hyphen|minus-sign|undersore|en-dash|em-dash
input = input.replace(/\.|·|dot/ig, "<dot>");

let words = input.split(wordDelim);
Expand Down
2 changes: 1 addition & 1 deletion src/core/operations/GroupIPAddresses.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ class GroupIPAddresses extends Operation {

// Sort IPv6 network dictionaries and print
for (networkStr in ipv6Networks) {
//ipv6Networks[networkStr] = ipv6Networks[networkStr].sort(); TODO
// ipv6Networks[networkStr] = ipv6Networks[networkStr].sort(); TODO

output += networkStr + "/" + cidr + "\n";

Expand Down
4 changes: 2 additions & 2 deletions src/core/operations/Lorenz.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -391,7 +391,7 @@ class Lorenz extends Operation {
// Chi 2 one back lim - The active character of Chi 2 (2nd Chi wheel) in the previous position
lim = parseInt(chiSettings[2][x2bptr-1], 10);
if (kt) {
//p5 back 2
// p5 back 2
if (lim===p5[2]) {
lim = 0;
} else {
Expand All @@ -413,7 +413,7 @@ class Lorenz extends Operation {
lim = 1;
if (x2b1lug===s1b1lug) lim=0;
if (kt) {
//p5 back 2
// p5 back 2
if (lim===p5[2]) {
lim=0;
} else {
Expand Down
2 changes: 1 addition & 1 deletion src/node/api.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* @license Apache-2.0
*/

/*eslint no-console: ["off"] */
/* eslint no-console: ["off"] */

import NodeDish from "./NodeDish.mjs";
import NodeRecipe from "./NodeRecipe.mjs";
Expand Down
2 changes: 1 addition & 1 deletion src/node/cjs.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
* @license Apache-2.0
*/

/*eslint no-global-assign: ["off"] */
/* eslint no-global-assign: ["off"] */
require = require("esm")(module);
module.exports = require("./index.mjs");
module.exports.File = require("./File.mjs");
2 changes: 1 addition & 1 deletion src/node/config/scripts/generateNodeIndex.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
* @license Apache-2.0
*/

/*eslint no-console: 0 */
/* eslint no-console: 0 */

import fs from "fs";
import path from "path";
Expand Down
2 changes: 1 addition & 1 deletion src/node/repl.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ const chef = require("./cjs.js");
const repl = require("repl");


/*eslint no-console: ["off"] */
/* eslint no-console: ["off"] */

console.log(`
______ __ ________ ____
Expand Down
2 changes: 1 addition & 1 deletion src/web/App.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -604,7 +604,7 @@ class App {
else if (prev[1] > 0) prev[1]--;
else prev[0]--;

//const compareURL = `https://github.com/gchq/CyberChef/compare/v${prev.join(".")}...v${PKG_VERSION}`;
// const compareURL = `https://github.com/gchq/CyberChef/compare/v${prev.join(".")}...v${PKG_VERSION}`;

let compileInfo = `<a href='https://github.com/gchq/CyberChef/blob/master/CHANGELOG.md'>Last build: ${timeSinceCompile.substr(0, 1).toUpperCase() + timeSinceCompile.substr(1)} ago</a>`;

Expand Down
1 change: 0 additions & 1 deletion src/web/waiters/HighlighterWaiter.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -446,7 +446,6 @@ class HighlighterWaiter {
}

const cssClass = "hl1";
//if (colour) cssClass += "-"+colour;

// Remove HTML tags
text = text
Expand Down
28 changes: 14 additions & 14 deletions src/web/waiters/InputWaiter.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -29,20 +29,20 @@ class InputWaiter {

// Define keys that don't change the input so we don't have to autobake when they are pressed
this.badKeys = [
16, //Shift
17, //Ctrl
18, //Alt
19, //Pause
20, //Caps
27, //Esc
33, 34, 35, 36, //PgUp, PgDn, End, Home
37, 38, 39, 40, //Directional
44, //PrntScrn
91, 92, //Win
93, //Context
112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, //F1-12
144, //Num
145, //Scroll
16, // Shift
17, // Ctrl
18, // Alt
19, // Pause
20, // Caps
27, // Esc
33, 34, 35, 36, // PgUp, PgDn, End, Home
37, 38, 39, 40, // Directional
44, // PrntScrn
91, 92, // Win
93, // Context
112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, // F1-12
144, // Num
145, // Scroll
];

this.inputWorker = null;
Expand Down
2 changes: 1 addition & 1 deletion tests/node/tests/NodeDish.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ TestRegister.addApiTests([
<a href="https://github.com">Click here</a>
<script src="script.js"></script>
</body>
</html>`.replace(/\n|\s{4}/g, ""); //remove newlines, tabs
</html>`.replace(/\n|\s{4}/g, ""); // remove newlines, tabs

const dish = new Dish(html, Dish.HTML);
dish.get(4);
Expand Down
2 changes: 1 addition & 1 deletion tests/operations/tests/ByteRepr.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ TestRegister.addTests([
},
{
name: "To Octal: Γειά σου",
input: "Γειά σου", //[206,147,206,181,206,185,206,172,32,207,131,206,191,207,133],
input: "Γειά σου", // [206,147,206,181,206,185,206,172,32,207,131,206,191,207,133],
expectedOutput: "316 223 316 265 316 271 316 254 40 317 203 316 277 317 205",
recipeConfig: [
{
Expand Down
4 changes: 2 additions & 2 deletions tests/operations/tests/Hash.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -1099,7 +1099,7 @@ TestRegister.addTests([
}
]
}
/*{ // This takes a LONG time to run (over a minute usually).
/* { // This takes a LONG time to run (over a minute usually).
name: "Scrypt: RFC test vector 4",
input: "pleaseletmein",
expectedOutput: "2101cb9b6a511aaeaddbbe09cf70f881ec568d574a2ffd4dabe5ee9820adaa478e56fd8f4ba5d09ffa1c6d927c40f4c337304049e8a952fbcbf45c6fa77a41a4",
Expand All @@ -1115,5 +1115,5 @@ TestRegister.addTests([
]
}
]
},*/
}, */
]);
4 changes: 2 additions & 2 deletions tests/operations/tests/Image.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ TestRegister.addTests([
}
]
},
/*{ This operation only works in a browser
/* { This operation only works in a browser
name: "Optical Character Recognition",
input: "iVBORw0KGgoAAAANSUhEUgAAAUAAAAC0CAIAAABqhmJGAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAASuSURBVHhe7dftVdswAIbRzsVAzMM0XabDUCOUxLYsWW4Jp+/pvf9w9GH76CHw4x2IJWAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAI9p8G/PbyY8rL2686g8t+vnqHTyfgIYfvz/26veTXn/UKX8+f0EU9bHrtu/6KfAN/AwEXAj7lFf2TBFw4nae8on+SgIvJ01n/KLzpDK+L3bT/Ap4O+HC+V12mTH+M3gzcLbIY/EO6HfxYp13k09nb6r3UqcdnjoCL3ll72J26h+35Oxy2XvZ0wOLaXq9v2+F1UC+7RZtMZ/DnfX1lwDOPzwUCLo7O2trtDK8H3M/iqoc6bj1subT68XTA/F7bGJooyzKbhTvLPHY8eJLHlbNX1DqYUVfdXbqwJjsCLsans37aNNJM6w68OR0wv9f9ymKw3k67yn2ZZpHlg3a3zis60s6oV+ZvlzMCLoanc3Dsdt9TdWT/lM8OmNjr5KY72jmzq1zfrbvXtVtmRMDF8HTWcgaaqIrD1U4G/MFewxrW262s5jS/Fzpmdts6mnHy+Fwl4GJ0OjsNrG1P/y7CNo3+gEt7jW56MVprNed7A/5w+n6YJ+BieDpnj/jO6pweTz0acGWvmZveL9XOmd3x6wKuTt8PEwRczLRw4eje1XX7c/cDruw1uuneOu2c4aOvzI57mJhRh1xZlQ0BF+Oz9vcF96fuB1zYa7R2b5mD6/XSwdfg8snj4q21+W/L02dfzIxhQMDFyTm6Hd7m+JYP7rPKT5sRuzhOBywm91rUkYc3fV9ltchtr8VmzuGOdfDB9N1tFYefNfdXLmyGjNZkhoCLUQufVqd/7z7rUcLW/XieDvg0s9difNOdRV5ePibt5vTuazusWbF9rs2E5v4mH58LBFyMW7g5OID7s9cMuTygmt9rcNPb5MrAz0lHc3Z9Ht7XZsxqxO36ZtLR/c0+PpMEzLOc/4LhrwmYZ6lfywJ+JgHzJPr9DgLmi23/zdXvcwmYL7YKWL1PJ2AIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmAIJmCI9f7+G6yFxVg/GyYwAAAAAElFTkSuQmCC",
expectedOutput: "Tesseract.js\n",
Expand All @@ -262,5 +262,5 @@ TestRegister.addTests([
"args": [false]
}
]
}*/
} */
]);