Skip to content

Commit

Permalink
Merge pull request jagenjo#347 from moritz89/master
Browse files Browse the repository at this point in the history
Proposed variable type update
  • Loading branch information
jagenjo authored Mar 20, 2023
2 parents 10cd9b7 + 47ac1b7 commit 412e833
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 19 deletions.
14 changes: 9 additions & 5 deletions .eslintrc → .eslintrc.js
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
28 changes: 14 additions & 14 deletions src/litegraph.js
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 412e833

Please sign in to comment.