From 47ac1b7612659f32496f14027e81b987410610b8 Mon Sep 17 00:00:00 2001 From: Moritz Ulmer Date: Mon, 20 Mar 2023 10:54:38 +0100 Subject: [PATCH] Proposed variable type update Why: - Reduces scope to required / expected of variables This change addresses the need by: - Using let / const instead of global / var - Update ESlint configurtation --- .eslintrc => .eslintrc.js | 14 +++++++++----- src/litegraph.js | 28 ++++++++++++++-------------- 2 files changed, 23 insertions(+), 19 deletions(-) rename .eslintrc => .eslintrc.js (90%) diff --git a/.eslintrc b/.eslintrc.js similarity index 90% rename from .eslintrc rename to .eslintrc.js index 11fb9cd75e..4523a9fd58 100644 --- a/.eslintrc +++ b/.eslintrc.js @@ -1,12 +1,16 @@ -{ - "extends": "eslint:recommended", - "parserOptions": { - "ecmaVersion": 5 - }, +module.exports = { "env": { "browser": true, + "es2021": true, "node": true }, + "extends": "eslint:recommended", + "overrides": [ + ], + "parserOptions": { + "ecmaVersion": "latest", + "sourceType": "module" + }, "globals": { "gl": true, "GL": true, diff --git a/src/litegraph.js b/src/litegraph.js index b22f6cc611..515116b941 100644 --- a/src/litegraph.js +++ b/src/litegraph.js @@ -1262,35 +1262,35 @@ LGraph.prototype.arrange = function (margin, layout) { margin = margin || 100; - var nodes = this.computeExecutionOrder(false, true); - var columns = []; - for (var i = 0; i < nodes.length; ++i) { - var node = nodes[i]; - var col = node._level || 1; + const nodes = this.computeExecutionOrder(false, true); + const columns = []; + for (let i = 0; i < nodes.length; ++i) { + const node = nodes[i]; + const col = node._level || 1; if (!columns[col]) { columns[col] = []; } columns[col].push(node); } - var x = margin; + let x = margin; - for (var i = 0; i < columns.length; ++i) { - var column = columns[i]; + for (let i = 0; i < columns.length; ++i) { + const column = columns[i]; if (!column) { continue; } - var max_size = 100; - var y = margin + LiteGraph.NODE_TITLE_HEIGHT; - for (var j = 0; j < column.length; ++j) { - var node = column[j]; + let max_size = 100; + let y = margin + LiteGraph.NODE_TITLE_HEIGHT; + for (let j = 0; j < column.length; ++j) { + const node = column[j]; node.pos[0] = (layout == LiteGraph.VERTICAL_LAYOUT) ? y : x; node.pos[1] = (layout == LiteGraph.VERTICAL_LAYOUT) ? x : y; - var max_size_index = (layout == LiteGraph.VERTICAL_LAYOUT) ? 1 : 0; + const max_size_index = (layout == LiteGraph.VERTICAL_LAYOUT) ? 1 : 0; if (node.size[max_size_index] > max_size) { max_size = node.size[max_size_index]; } - var node_size_index = (layout == LiteGraph.VERTICAL_LAYOUT) ? 0 : 1; + const node_size_index = (layout == LiteGraph.VERTICAL_LAYOUT) ? 0 : 1; y += node.size[node_size_index] + margin + LiteGraph.NODE_TITLE_HEIGHT; } x += max_size + margin;