mirror of
https://github.com/Azornes/Comfyui-LayerForge.git
synced 2026-03-24 14:02:11 -03:00
Refactor codebase for consistent formatting and style
This commit applies consistent code formatting across multiple files, including spacing, indentation, and object destructuring. No functional changes were made; the update improves code readability and maintainability.
This commit is contained in:
@@ -7,6 +7,7 @@ import {CanvasRenderer} from "./CanvasRenderer.js";
|
|||||||
import {CanvasIO} from "./CanvasIO.js";
|
import {CanvasIO} from "./CanvasIO.js";
|
||||||
import {ImageReferenceManager} from "./ImageReferenceManager.js";
|
import {ImageReferenceManager} from "./ImageReferenceManager.js";
|
||||||
import {createModuleLogger} from "./utils/LoggerUtils.js";
|
import {createModuleLogger} from "./utils/LoggerUtils.js";
|
||||||
|
|
||||||
const log = createModuleLogger('Canvas');
|
const log = createModuleLogger('Canvas');
|
||||||
|
|
||||||
export class Canvas {
|
export class Canvas {
|
||||||
@@ -137,6 +138,7 @@ export class Canvas {
|
|||||||
this.onSelectionChange();
|
this.onSelectionChange();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
async copySelectedLayers() {
|
async copySelectedLayers() {
|
||||||
return this.canvasLayers.copySelectedLayers();
|
return this.canvasLayers.copySelectedLayers();
|
||||||
}
|
}
|
||||||
@@ -265,8 +267,6 @@ export class Canvas {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
async getFlattenedCanvasAsBlob() {
|
async getFlattenedCanvasAsBlob() {
|
||||||
return this.canvasLayers.getFlattenedCanvasAsBlob();
|
return this.canvasLayers.getFlattenedCanvasAsBlob();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
import {createModuleLogger} from "./utils/LoggerUtils.js";
|
import {createModuleLogger} from "./utils/LoggerUtils.js";
|
||||||
import {snapToGrid, getSnapAdjustment} from "./utils/CommonUtils.js";
|
import {snapToGrid, getSnapAdjustment} from "./utils/CommonUtils.js";
|
||||||
|
|
||||||
const log = createModuleLogger('CanvasInteractions');
|
const log = createModuleLogger('CanvasInteractions');
|
||||||
|
|
||||||
export class CanvasInteractions {
|
export class CanvasInteractions {
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ import {saveImage, removeImage} from "./db.js";
|
|||||||
import {createModuleLogger} from "./utils/LoggerUtils.js";
|
import {createModuleLogger} from "./utils/LoggerUtils.js";
|
||||||
import {generateUUID, generateUniqueFileName} from "./utils/CommonUtils.js";
|
import {generateUUID, generateUniqueFileName} from "./utils/CommonUtils.js";
|
||||||
import {withErrorHandling, createValidationError} from "./ErrorHandler.js";
|
import {withErrorHandling, createValidationError} from "./ErrorHandler.js";
|
||||||
|
|
||||||
const log = createModuleLogger('CanvasLayers');
|
const log = createModuleLogger('CanvasLayers');
|
||||||
|
|
||||||
export class CanvasLayers {
|
export class CanvasLayers {
|
||||||
@@ -358,6 +359,7 @@ export class CanvasLayers {
|
|||||||
this.canvasLayers.selectedLayer = layer;
|
this.canvasLayers.selectedLayer = layer;
|
||||||
this.canvasLayers.render();
|
this.canvasLayers.render();
|
||||||
}
|
}
|
||||||
|
|
||||||
isRotationHandle(x, y) {
|
isRotationHandle(x, y) {
|
||||||
if (!this.canvasLayers.selectedLayer) return false;
|
if (!this.canvasLayers.selectedLayer) return false;
|
||||||
|
|
||||||
@@ -428,12 +430,18 @@ export class CanvasLayers {
|
|||||||
const handleRadius = 5;
|
const handleRadius = 5;
|
||||||
const handles = {
|
const handles = {
|
||||||
'nw': {x: this.canvasLayers.selectedLayer.x, y: this.canvasLayers.selectedLayer.y},
|
'nw': {x: this.canvasLayers.selectedLayer.x, y: this.canvasLayers.selectedLayer.y},
|
||||||
'ne': {x: this.canvasLayers.selectedLayer.x + this.canvasLayers.selectedLayer.width, y: this.canvasLayers.selectedLayer.y},
|
'ne': {
|
||||||
|
x: this.canvasLayers.selectedLayer.x + this.canvasLayers.selectedLayer.width,
|
||||||
|
y: this.canvasLayers.selectedLayer.y
|
||||||
|
},
|
||||||
'se': {
|
'se': {
|
||||||
x: this.canvasLayers.selectedLayer.x + this.canvasLayers.selectedLayer.width,
|
x: this.canvasLayers.selectedLayer.x + this.canvasLayers.selectedLayer.width,
|
||||||
y: this.canvasLayers.selectedLayer.y + this.canvasLayers.selectedLayer.height
|
y: this.canvasLayers.selectedLayer.y + this.canvasLayers.selectedLayer.height
|
||||||
},
|
},
|
||||||
'sw': {x: this.canvasLayers.selectedLayer.x, y: this.canvasLayers.selectedLayer.y + this.canvasLayers.selectedLayer.height}
|
'sw': {
|
||||||
|
x: this.canvasLayers.selectedLayer.x,
|
||||||
|
y: this.canvasLayers.selectedLayer.y + this.canvasLayers.selectedLayer.height
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
for (const [position, point] of Object.entries(handles)) {
|
for (const [position, point] of Object.entries(handles)) {
|
||||||
@@ -443,6 +451,7 @@ export class CanvasLayers {
|
|||||||
}
|
}
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
showBlendModeMenu(x, y) {
|
showBlendModeMenu(x, y) {
|
||||||
const existingMenu = document.getElementById('blend-mode-menu');
|
const existingMenu = document.getElementById('blend-mode-menu');
|
||||||
if (existingMenu) {
|
if (existingMenu) {
|
||||||
@@ -594,6 +603,7 @@ export class CanvasLayers {
|
|||||||
modeElement.appendChild(slider);
|
modeElement.appendChild(slider);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
async getFlattenedCanvasAsBlob() {
|
async getFlattenedCanvasAsBlob() {
|
||||||
return new Promise((resolve, reject) => {
|
return new Promise((resolve, reject) => {
|
||||||
const tempCanvas = document.createElement('canvas');
|
const tempCanvas = document.createElement('canvas');
|
||||||
@@ -633,6 +643,7 @@ export class CanvasLayers {
|
|||||||
}, 'image/png');
|
}, 'image/png');
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
async getFlattenedSelectionAsBlob() {
|
async getFlattenedSelectionAsBlob() {
|
||||||
if (this.canvasLayers.selectedLayers.length === 0) {
|
if (this.canvasLayers.selectedLayers.length === 0) {
|
||||||
return null;
|
return null;
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
import {createModuleLogger} from "./utils/LoggerUtils.js";
|
import {createModuleLogger} from "./utils/LoggerUtils.js";
|
||||||
|
|
||||||
const log = createModuleLogger('CanvasRenderer');
|
const log = createModuleLogger('CanvasRenderer');
|
||||||
|
|
||||||
export class CanvasRenderer {
|
export class CanvasRenderer {
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ import {getCanvasState, setCanvasState, saveImage, getImage} from "./db.js";
|
|||||||
import {createModuleLogger} from "./utils/LoggerUtils.js";
|
import {createModuleLogger} from "./utils/LoggerUtils.js";
|
||||||
import {generateUUID, cloneLayers, getStateSignature, debounce} from "./utils/CommonUtils.js";
|
import {generateUUID, cloneLayers, getStateSignature, debounce} from "./utils/CommonUtils.js";
|
||||||
import {withErrorHandling} from "./ErrorHandler.js";
|
import {withErrorHandling} from "./ErrorHandler.js";
|
||||||
|
|
||||||
const log = createModuleLogger('CanvasState');
|
const log = createModuleLogger('CanvasState');
|
||||||
|
|
||||||
export class CanvasState {
|
export class CanvasState {
|
||||||
|
|||||||
@@ -789,9 +789,6 @@ async function createCanvasWidget(node, widget, app) {
|
|||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
const mainContainer = $el("div.painterMainContainer", {
|
const mainContainer = $el("div.painterMainContainer", {
|
||||||
style: {
|
style: {
|
||||||
position: "relative",
|
position: "relative",
|
||||||
@@ -922,7 +919,6 @@ async function createCanvasWidget(node, widget, app) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
node.canvasWidget = canvas;
|
node.canvasWidget = canvas;
|
||||||
|
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
@@ -1003,6 +999,10 @@ app.registerExtension({
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Iterate through every widget attached to this node
|
||||||
|
this.widgets.forEach(w => {
|
||||||
|
log.debug(`Widget name: ${w.name}, type: ${w.type}, value: ${w.value}`);
|
||||||
|
});
|
||||||
|
|
||||||
const nodeIdWidget = this.widgets.find(w => w.name === "node_id");
|
const nodeIdWidget = this.widgets.find(w => w.name === "node_id");
|
||||||
if (nodeIdWidget) {
|
if (nodeIdWidget) {
|
||||||
|
|||||||
@@ -224,6 +224,7 @@ export class ErrorHandler {
|
|||||||
log.info('Error history cleared');
|
log.info('Error history cleared');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
const errorHandler = new ErrorHandler();
|
const errorHandler = new ErrorHandler();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -346,5 +347,6 @@ export async function retryWithBackoff(operation, maxRetries = 3, baseDelay = 10
|
|||||||
|
|
||||||
throw errorHandler.handle(lastError, context, {attempts: maxRetries + 1});
|
throw errorHandler.handle(lastError, context, {attempts: maxRetries + 1});
|
||||||
}
|
}
|
||||||
|
|
||||||
export {errorHandler};
|
export {errorHandler};
|
||||||
export default errorHandler;
|
export default errorHandler;
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
import {createModuleLogger} from "./utils/LoggerUtils.js";
|
import {createModuleLogger} from "./utils/LoggerUtils.js";
|
||||||
|
|
||||||
const log = createModuleLogger('ImageCache');
|
const log = createModuleLogger('ImageCache');
|
||||||
|
|
||||||
export class ImageCache {
|
export class ImageCache {
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
import {createModuleLogger} from "./utils/LoggerUtils.js";
|
import {createModuleLogger} from "./utils/LoggerUtils.js";
|
||||||
|
|
||||||
const log = createModuleLogger('Mask_tool');
|
const log = createModuleLogger('Mask_tool');
|
||||||
|
|
||||||
export class MaskTool {
|
export class MaskTool {
|
||||||
|
|||||||
1
js/db.js
1
js/db.js
@@ -1,4 +1,5 @@
|
|||||||
import {createModuleLogger} from "./utils/LoggerUtils.js";
|
import {createModuleLogger} from "./utils/LoggerUtils.js";
|
||||||
|
|
||||||
const log = createModuleLogger('db');
|
const log = createModuleLogger('db');
|
||||||
|
|
||||||
const DB_NAME = 'CanvasNodeDB';
|
const DB_NAME = 'CanvasNodeDB';
|
||||||
|
|||||||
@@ -314,6 +314,7 @@ class Logger {
|
|||||||
this.log(module, LogLevel.ERROR, ...args);
|
this.log(module, LogLevel.ERROR, ...args);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
export const logger = new Logger();
|
export const logger = new Logger();
|
||||||
export const debug = (module, ...args) => logger.debug(module, ...args);
|
export const debug = (module, ...args) => logger.debug(module, ...args);
|
||||||
export const info = (module, ...args) => logger.info(module, ...args);
|
export const info = (module, ...args) => logger.info(module, ...args);
|
||||||
|
|||||||
Reference in New Issue
Block a user