The most powerful and modular diffusion model GUI, api and backend with a graph/nodes interface. The fastest local inference engine in the world.
Refactor the template manager (#1878)
Matteo Spinelli6e84a01ecc31
diff --git a/web/extensions/core/nodeTemplates.js b/web/extensions/core/nodeTemplates.jsindex 434491075..b6479f454 100644--- a/web/extensions/core/nodeTemplates.js+++ b/web/extensions/core/nodeTemplates.js@@ -14,6 +14,9 @@ import { ComfyDialog, $el } from "../../scripts/ui.js";// To delete/rename:// Right click the canvas// Node templates -> Manage+//+// To rearrange:+// Open the manage dialog and Drag and drop elements using the "Name:" label as handleconst id = "Comfy.NodeTemplates";@@ -22,6 +25,10 @@ class ManageTemplates extends ComfyDialog {super();this.element.classList.add("comfy-manage-templates");this.templates = this.load();+ this.draggedEl = null;+ this.saveVisualCue = null;+ this.emptyImg = new Image();+ this.emptyImg.src = 'data:image/gif;base64,R0lGODlhAQABAIAAAAUEBAAAACwAAAAAAQABAAACAkQBADs=';this.importInput = $el("input", {type: "file",@@ -35,14 +42,11 @@ class ManageTemplates extends ComfyDialog {createButtons() {const btns = super.createButtons();- btns[0].textContent = "Cancel";- btns.unshift(- $el("button", {- type: "button",- textContent: "Save",- onclick: () => this.save(),- })- );+ btns[0].textContent = "Close";+ btns[0].onclick = (e) => {+ clearTimeout(this.saveVisualCue);+ this.close();+ };btns.unshift($el("button", {type: "button",@@ -71,25 +75,6 @@ class ManageTemplates extends ComfyDialog {}}- save() {- // Find all visible inputs and save them as our new list- const inputs = this.element.querySelectorAll("input");- const updated = [];-- for (let i = 0; i < inputs.length; i++) {- const input = inputs[i];- if (input.parentElement.style.display !== "none") {- const t = this.templates[i];- t.name = input.value.trim() || input.getAttribute("data-name");- updated.push(t);- }- }-- this.templates = updated;- this.store();- this.close();- }-store() {localStorage.setItem(id, JSON.stringify(this.templates));}@@ -145,71 +130,155 @@ class ManageTemplates extends ComfyDialog {super.show($el("div",- {- style: {- display: "grid",- gridTemplateColumns: "1fr auto",- gap: "5px",- },- },- this.templates.flatMap((t) => {+ {},+ this.templates.flatMap((t,i) => {let nameInput;return [$el(- "label",+ "div",{- textContent: "Name: ",+ dataset: { id: i },+ className: "tempateManagerRow",+ style: {+ display: "grid",+ gridTemplateColumns: "1fr auto",+ border: "1px dashed transparent",+ gap: "5px",+ backgroundColor: "var(--comfy-menu-bg)"+ },+ ondragstart: (e) => {+ this.draggedEl = e.currentTarget;+ e.currentTarget.style.opacity = "0.6";+ e.currentTarget.style.border = "1px dashed yellow";+ e.dataTransfer.effectAllowed = 'move';+ e.dataTransfer.setDragImage(this.emptyImg, 0, 0);+ },+ ondragend: (e) => {+ e.target.style.opacity = "1";+ e.currentTarget.style.border = "1px dashed transparent";+ e.currentTarget.removeAttribute("draggable");++ // rearrange the elements in the localStorage+ this.element.querySelectorAll('.tempateManagerRow').forEach((el,i) => {+ var prev_i = el.dataset.id;++ if ( el == this.draggedEl && prev_i != i ) {+ [this.templates[i], this.templates[prev_i]] = [this.templates[prev_i], this.templates[i]];+ }+ el.dataset.id = i;+ });+ this.store();+ },+ ondragover: (e) => {+ e.preventDefault();+ if ( e.currentTarget == this.draggedEl )+ return;++ let rect = e.currentTarget.getBoundingClientRect();+ if (e.clientY > rect.top + rect.height / 2) {+ e.currentTarget.parentNode.insertBefore(this.draggedEl, e.currentTarget.nextSibling);+ } else {+ e.currentTarget.parentNode.insertBefore(this.draggedEl, e.currentTarget);+ }+ }},[- $el("input", {- value: t.name,- dataset: { name: t.name },- $: (el) => (nameInput = el),- }),- ]- ),- $el(- "div",- {},- [- $el("button", {- textContent: "Export",- style: {- fontSize: "12px",- fontWeight: "normal",- },- onclick: (e) => {- const json = JSON.stringify({templates: [t]}, null, 2); // convert the data to a JSON string- const blob = new Blob([json], {type: "application/json"});- const url = URL.createObjectURL(blob);- const a = $el("a", {- href: url,- download: (nameInput.value || t.name) + ".json",- style: {display: "none"},- parent: document.body,- });- a.click();- setTimeout(function () {- a.remove();- window.URL.revokeObjectURL(url);- }, 0);- },- }),- $el("button", {- textContent: "Delete",- style: {- fontSize: "12px",- color: "red",- fontWeight: "normal",- },- onclick: (e) => {- nameInput.value = "";- e.target.parentElement.style.display = "none";- e.target.parentElement.previousElementSibling.style.display = "none";+ $el(+ "label",+ {+ textContent: "Name: ",+ style: {+ cursor: "grab",+ },+ onmousedown: (e) => {+ // enable dragging only from the label+ if (e.target.localName == 'label')+ e.currentTarget.parentNode.draggable = 'true';+ }},- }),+ [+ $el("input", {+ value: t.name,+ dataset: { name: t.name },+ style: {+ transitionProperty: 'background-color',+ transitionDuration: '0s',+ },+ onchange: (e) => {+ clearTimeout(this.saveVisualCue);+ var el = e.target;+ var row = el.parentNode.parentNode;+ this.templates[row.dataset.id].name = el.value.trim() || 'untitled';+ this.store();+ el.style.backgroundColor = 'rgb(40, 95, 40)';+ el.style.transitionDuration = '0s';+ this.saveVisualCue = setTimeout(function () {+ el.style.transitionDuration = '.7s';+ el.style.backgroundColor = 'var(--comfy-input-bg)';+ }, 15);+ },+ onkeypress: (e) => {+ var el = e.target;+ clearTimeout(this.saveVisualCue);+ el.style.transitionDuration = '0s';+ el.style.backgroundColor = 'var(--comfy-input-bg)';+ },+ $: (el) => (nameInput = el),+ })+ ]+ ),+ $el(+ "div",+ {},+ [+ $el("button", {+ textContent: "Export",+ style: {+ fontSize: "12px",+ fontWeight: "normal",+ },+ onclick: (e) => {+ const json = JSON.stringify({templates: [t]}, null, 2); // convert the data to a JSON string+ const blob = new Blob([json], {type: "application/json"});+ const url = URL.createObjectURL(blob);+ const a = $el("a", {+ href: url,+ download: (nameInput.value || t.name) + ".json",+ style: {display: "none"},+ parent: document.body,+ });+ a.click();+ setTimeout(function () {+ a.remove();+ window.URL.revokeObjectURL(url);+ }, 0);+ },+ }),+ $el("button", {+ textContent: "Delete",+ style: {+ fontSize: "12px",+ color: "red",+ fontWeight: "normal",+ },+ onclick: (e) => {+ const item = e.target.parentNode.parentNode;+ item.parentNode.removeChild(item);+ this.templates.splice(item.dataset.id*1, 1);+ this.store();+ // update the rows index, setTimeout ensures that the list is updated+ var that = this;+ setTimeout(function (){+ that.element.querySelectorAll('.tempateManagerRow').forEach((el,i) => {+ el.dataset.id = i;+ });+ }, 0);+ },+ }),+ ]+ ),]- ),+ )];}))