qnloft
/
ComfyUI
mirror of https://github.com/comfyanonymous/ComfyUI.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'undoredo-fix-modifiers' of https://github.com/pythongosssss/ComfyUI

This commit is contained in:
comfyanonymous 2024-01-13 16:03:44 -05:00
parent 18511dd581 9bddc9d94b
commit b5ece6354d
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
web/extensions/core/groupNode.js
View File

@ -884,6 +884,7 @@ export class GroupNodeHandler {
const r = onDrawForeground?.apply?.(this, arguments); const r = onDrawForeground?.apply?.(this, arguments);
if (+app.runningNodeId === this.id && this.runningInternalNodeId !== null) { if (+app.runningNodeId === this.id && this.runningInternalNodeId !== null) {
const n = groupData.nodes[this.runningInternalNodeId]; const n = groupData.nodes[this.runningInternalNodeId];
if(!n) return;
const message = `Running ${n.title || n.type} (${this.runningInternalNodeId}/${groupData.nodes.length})`; const message = `Running ${n.title || n.type} (${this.runningInternalNodeId}/${groupData.nodes.length})`;
ctx.save(); ctx.save();
ctx.font = "12px sans-serif"; ctx.font = "12px sans-serif";

11
web/extensions/core/undoRedo.js
View File

@ -106,6 +106,7 @@ const bindInput = (activeEl) => {
} }
}; };
let keyIgnored = false;
window.addEventListener( window.addEventListener(
"keydown", "keydown",
(e) => { (e) => {
@ -116,6 +117,9 @@ window.addEventListener(
return; return;
} }
keyIgnored = e.key === "Control" || e.key === "Shift" || e.key === "Alt" || e.key === "Meta";
if (keyIgnored) return;
// Check if this is a ctrl+z ctrl+y // Check if this is a ctrl+z ctrl+y
if (await undoRedo(e)) return; if (await undoRedo(e)) return;
@ -127,6 +131,13 @@ window.addEventListener(
true true
); );
window.addEventListener("keyup", (e) => {
if (keyIgnored) {
keyIgnored = false;
checkState();
}
});
// Handle clicking DOM elements (e.g. widgets) // Handle clicking DOM elements (e.g. widgets)
window.addEventListener("mouseup", () => { window.addEventListener("mouseup", () => {
checkState(); checkState();