diff --git a/src/extensions/core/nodeTemplates.ts b/src/extensions/core/nodeTemplates.ts index 5e2595490..9cc374a54 100644 --- a/src/extensions/core/nodeTemplates.ts +++ b/src/extensions/core/nodeTemplates.ts @@ -222,13 +222,15 @@ class ManageTemplates extends ComfyDialog { if (target === this.draggedEl) return const rect = target.getBoundingClientRect() - if (e.clientY > rect.top + rect.height / 2) { - target.parentNode?.insertBefore( - this.draggedEl!, - target.nextSibling - ) - } else { - target.parentNode?.insertBefore(this.draggedEl!, target) + if (this.draggedEl) { + if (e.clientY > rect.top + rect.height / 2) { + target.parentNode?.insertBefore( + this.draggedEl, + target.nextSibling + ) + } else { + target.parentNode?.insertBefore(this.draggedEl, target) + } } } }, diff --git a/src/lib/litegraph/src/LGraph.ts b/src/lib/litegraph/src/LGraph.ts index 560041b88..51592f1e2 100644 --- a/src/lib/litegraph/src/LGraph.ts +++ b/src/lib/litegraph/src/LGraph.ts @@ -707,12 +707,12 @@ export class LGraph const priorityA = ('priority' in ctorA && typeof ctorA.priority === 'number' ? ctorA.priority - : 0) || + : 0) ?? ('priority' in A && typeof A.priority === 'number' ? A.priority : 0) const priorityB = ('priority' in ctorB && typeof ctorB.priority === 'number' ? ctorB.priority - : 0) || + : 0) ?? ('priority' in B && typeof B.priority === 'number' ? B.priority : 0) // if same priority, sort by order return priorityA == priorityB ? A.order - B.order : priorityA - priorityB diff --git a/src/lib/litegraph/src/LGraphCanvas.ts b/src/lib/litegraph/src/LGraphCanvas.ts index 044fad131..628670918 100644 --- a/src/lib/litegraph/src/LGraphCanvas.ts +++ b/src/lib/litegraph/src/LGraphCanvas.ts @@ -1,3 +1,4 @@ +import { default as DOMPurify } from 'dompurify' import { toString } from 'es-toolkit/compat' import { PREFIX, SEPARATOR } from '@/constants/groupNodeConstants' @@ -7877,7 +7878,7 @@ export class LGraphCanvas implements CustomEventDispatcher const nodeDesc = 'desc' in ctor && typeof ctor.desc === 'string' ? ctor.desc : '' panel.addHTML( - `${node.type}${nodeDesc}` + `${DOMPurify.sanitize(node.type ?? '')}${DOMPurify.sanitize(nodeDesc)}` ) panel.addHTML('

Properties

') diff --git a/src/scripts/ui.ts b/src/scripts/ui.ts index 6b9795ea0..07da9462a 100644 --- a/src/scripts/ui.ts +++ b/src/scripts/ui.ts @@ -347,7 +347,7 @@ export class ComfyUI { history: ComfyList autoQueueMode!: string graphHasChanged!: boolean - autoQueueEnabled!: boolean + autoQueueEnabled: boolean = false menuContainer!: HTMLDivElement queueSize!: Element restoreMenuPosition!: () => void