From cc795f0f953d2952610e60eee69aa9be2a4abab0 Mon Sep 17 00:00:00 2001 From: Starbeamrainbowlabs Date: Wed, 2 Oct 2024 01:03:09 +0100 Subject: [PATCH] Fix eslint issues --- .docs/eleventy.config.mjs | 4 ++-- .docs/eslint.config.mjs | 5 +++-- .docs/img2brush/img2brush.js | 24 +++++++++++------------- .docs/lib/HTMLPicture.mjs | 6 +++--- .docs/lib/parse_sections.mjs | 8 ++++---- 5 files changed, 23 insertions(+), 24 deletions(-) diff --git a/.docs/eleventy.config.mjs b/.docs/eleventy.config.mjs index 7c04b4a..dae1b25 100644 --- a/.docs/eleventy.config.mjs +++ b/.docs/eleventy.config.mjs @@ -47,10 +47,10 @@ async function shortcode_image_url(src) { } async function shortcode_image_urlpass(src) { - let target_dir = `./_site/img`; + const target_dir = `./_site/img`; if(!fs.existsSync(target_dir)) await fs.promises.mkdir(target_dir, { recursive: true }); - let filename = path.basename(src); + const filename = path.basename(src); // Generally speaking we optimise PNGs *very* well with oxipng/Zopfli, // and the Image plugin doesn't respect this await fs.promises.copyFile(src, path.join(target_dir, filename)); diff --git a/.docs/eslint.config.mjs b/.docs/eslint.config.mjs index 64db309..57d6003 100644 --- a/.docs/eslint.config.mjs +++ b/.docs/eslint.config.mjs @@ -2,8 +2,9 @@ export default [ { files: ["**/*.js", "**/*.cjs", "**/*.mjs"], rules: { - "prefer-const": "warn", + "prefer-const": "warn", "no-constant-binary-expression": "error" - } + }, + ignores: ["**/_site/**"] } ]; diff --git a/.docs/img2brush/img2brush.js b/.docs/img2brush/img2brush.js index 5a9f487..5f837ef 100644 --- a/.docs/img2brush/img2brush.js +++ b/.docs/img2brush/img2brush.js @@ -1,12 +1,12 @@ window.addEventListener("load", () => { - let dropzone = document.querySelector("#dropzone"); + const dropzone = document.querySelector("#dropzone"); dropzone.addEventListener("dragenter", handle_drag_enter); dropzone.addEventListener("dragleave", handle_drag_leave); dropzone.addEventListener("dragover", handle_drag_over); dropzone.addEventListener("drop", handle_drop); document.querySelector("#brushimg-tsv").addEventListener("click", select_output); - let button_copy = document.querySelector("#brushimg-copy") + const button_copy = document.querySelector("#brushimg-copy") button_copy.addEventListener("click", () => { select_output(); button_copy.innerHTML = document.execCommand("copy") ? "Copied!" : "Failed to copy :-("; @@ -31,14 +31,14 @@ function get_source_channel_offset() { } function select_output() { - let output = document.querySelector("#brushimg-tsv"); + const output = document.querySelector("#brushimg-tsv"); - let selection = window.getSelection(); + const selection = window.getSelection(); if (selection.rangeCount > 0) selection.removeAllRanges(); - let range = document.createRange(); + const range = document.createRange(); range.selectNode(output); selection.addRange(range); } @@ -59,13 +59,11 @@ function handle_drop(event) { event.preventDefault(); event.target.classList.remove("dropzone-active"); - let image_file = null; + const image_file = event.dataTransfer.files[0]; - image_file = event.dataTransfer.files[0]; - - let reader = new FileReader(); + const reader = new FileReader(); reader.addEventListener("load", function(_event) { - let image = new Image(); + const image = new Image(); image.src = reader.result; image.addEventListener("load", () => handle_new_image(image)); @@ -78,7 +76,7 @@ function handle_drop(event) { } function image2pixels(image) { - let canvas = document.createElement("canvas"), + const canvas = document.createElement("canvas"), ctx = canvas.getContext("2d"); canvas.width = image.width; @@ -90,7 +88,7 @@ function image2pixels(image) { } function handle_new_image(image) { - let tsv = pixels2tsv(image2pixels(image)); + const tsv = pixels2tsv(image2pixels(image)); document.querySelector("#brushimg-stats").value = `${image.width} x ${image.height} | ${image.width * image.height} pixels`; document.querySelector("#brushimg-tsv").value = tsv; } @@ -100,7 +98,7 @@ function pixels2tsv(pixels) { console.info(`pixels2tsv: offset is ${offset}`); let result = ""; for(let y = 0; y < pixels.height; y++) { - let row = []; + const row = []; for(let x = 0; x < pixels.width; x++) { // No need to rescale here - this is done automagically by WorldEditAdditions. // r/b/g/alpha diff --git a/.docs/lib/HTMLPicture.mjs b/.docs/lib/HTMLPicture.mjs index 4590359..fd0f026 100644 --- a/.docs/lib/HTMLPicture.mjs +++ b/.docs/lib/HTMLPicture.mjs @@ -62,10 +62,10 @@ async function srcset(source_image, target_dir, urlpath, format = "__AUTO__", si debug(`SOURCE_SIZE`, source_size, `TARGET_FORMAT`, target_format); - let setitems = await Promise.all(sizes.map(async (size) => { - let target_filename = `${source_parsed.name}_${size}.${target_format}` + const setitems = await Promise.all(sizes.map(async (size) => { + const target_filename = `${source_parsed.name}_${size}.${target_format}` .replace(/%/, "pcent"); - let target_current = path.join( + const target_current = path.join( target_dir, target_filename ); diff --git a/.docs/lib/parse_sections.mjs b/.docs/lib/parse_sections.mjs index 018c65f..fa324fa 100644 --- a/.docs/lib/parse_sections.mjs +++ b/.docs/lib/parse_sections.mjs @@ -32,7 +32,7 @@ function extract_title(line) { } function make_section(acc, cat_current, cats) { - let title = extract_title(acc[0]); + const title = extract_title(acc[0]); return { category: cat_current, category_colour: cats.get(cat_current), @@ -62,14 +62,14 @@ export default function parse_sections(source) { const result = []; let acc = []; let cat_current = null; - for(let line of lines) { + for(const line of lines) { if(line.startsWith(`#`)) { - let heading_level = line.match(/^#+/)[0].length; + const heading_level = line.match(/^#+/)[0].length; // 1: Deal with the previous section if(acc.length > 0) { - let heading_level_prev = acc[0].match(/^#+/)[0].length; + const heading_level_prev = acc[0].match(/^#+/)[0].length; if(heading_level_prev === 3 && acc.length > 0 && heading_level <= 3) { result.push(make_section(acc, cat_current, cats)); }