Revise & Generate
+
diff --git a/tests/js/dragdrop.test.js b/tests/js/dragdrop.test.js
new file mode 100644
index 0000000..5f9f739
--- /dev/null
+++ b/tests/js/dragdrop.test.js
@@ -0,0 +1,65 @@
+'use strict';
+const test = require('node:test');
+const assert = require('node:assert');
+const D = require('../../resources/logic_dragdrop.js');
+
+const B = 'http://127.0.0.1:8188/';
+const mk = (file, extra) => Object.assign({ id: 1, file: file }, extra || {});
+
+test('uscgImageRef parses a /view URL (webp, nested subfolder)', () => {
+ const r = D.uscgImageRef(mk('/view?filename=img_1.webp&type=output&subfolder=benchmarks/Sess/images'), B);
+ assert.strictEqual(r.filename, 'img_1.webp');
+ assert.strictEqual(r.subfolder, 'benchmarks/Sess/images');
+ assert.strictEqual(r.type, 'output');
+ assert.strictEqual(r.mime, 'image/webp');
+ assert.strictEqual(r.absUrl, B + 'view?filename=img_1.webp&type=output&subfolder=benchmarks/Sess/images');
+ assert.strictEqual(D.uscgAnnotatedPath(r), 'benchmarks/Sess/images/img_1.webp [output]');
+});
+
+test('uscgImageRef: png/jpg mimes, url-encoded names, default type, empty subfolder', () => {
+ assert.strictEqual(D.uscgImageRef(mk('/view?filename=a.PNG'), B).mime, 'image/png');
+ assert.strictEqual(D.uscgImageRef(mk('/view?filename=a.jpeg'), B).mime, 'image/jpeg');
+ const r = D.uscgImageRef(mk('/view?filename=my%20pic%20%281%29.jpg&type=temp&subfolder='), B);
+ assert.strictEqual(r.filename, 'my pic (1).jpg');
+ assert.strictEqual(r.type, 'temp');
+ assert.strictEqual(D.uscgAnnotatedPath(r), 'my pic (1).jpg [temp]');
+ assert.strictEqual(D.uscgImageRef(mk('/view?filename=a.png'), B).type, 'output');
+});
+
+test('uscgImageRef returns null for videos, workflow cards, bad input', () => {
+ assert.strictEqual(D.uscgImageRef(mk('/view?filename=a.mp4', { media_type: 'video' }), B), null);
+ assert.strictEqual(D.uscgImageRef(mk('/view?filename=a.webp', { model_type: 'workflow' }), B), null);
+ assert.strictEqual(D.uscgImageRef(mk('/view?filename=a.mp4'), B), null);
+ assert.strictEqual(D.uscgImageRef(mk('/view?type=output'), B), null);
+ assert.strictEqual(D.uscgImageRef(null, B), null);
+ assert.strictEqual(D.uscgImageRef({}, B), null);
+});
+
+function fakeDt() {
+ const data = {}, added = [];
+ return { data, added, setData: (k, v) => { data[k] = v; }, items: { add: (f) => added.push(f) } };
+}
+
+test('uscgFillDragData sets the four carriers and no File by default', () => {
+ const ref = D.uscgImageRef(mk('/view?filename=img_1.webp&type=output&subfolder=b/s'), B);
+ const dt = fakeDt();
+ D.uscgFillDragData(dt, ref, null);
+ assert.deepStrictEqual(JSON.parse(dt.data['application/x-comfy-asset-info']),
+ { filename: 'img_1.webp', subfolder: 'b/s', type: 'output', display_name: 'img_1.webp' });
+ assert.strictEqual(dt.data['text/uri-list'], ref.absUrl);
+ assert.strictEqual(dt.data['text/plain'], ref.absUrl);
+ assert.strictEqual(dt.data['DownloadURL'], 'image/webp:img_1.webp:' + ref.absUrl);
+ assert.strictEqual(dt.added.length, 0);
+ assert.strictEqual(dt.effectAllowed, 'copy');
+});
+
+test('uscgFillDragData attaches a File only when one is passed; survives items.add throwing', () => {
+ const ref = D.uscgImageRef(mk('/view?filename=a.png'), B);
+ const dt = fakeDt();
+ D.uscgFillDragData(dt, ref, { name: 'a.png' });
+ assert.strictEqual(dt.added.length, 1);
+ const bad = { setData() {}, items: { add() { throw new Error('protected'); } } };
+ assert.doesNotThrow(() => D.uscgFillDragData(bad, ref, {}));
+});
+
+test('upload mode is off by default', () => { assert.strictEqual(D.USCG_DRAG_UPLOAD, false); });
diff --git a/tests/test_standalone_html.py b/tests/test_standalone_html.py
index b79293b..0a6b603 100644
--- a/tests/test_standalone_html.py
+++ b/tests/test_standalone_html.py
@@ -77,3 +77,12 @@ def test_concatenated_script_parses_as_one_script(standalone):
f.write(js)
out = subprocess.run([NODE, "--check", path], capture_output=True, timeout=60)
assert out.returncode == 0, out.stderr.decode()
+
+
+def test_dragdrop_helpers_inlined_before_logic_ui():
+ html = _page()
+ assert "function uscgImageRef(" in html
+ assert 'id="modal-send-loadimage-btn"' in html
+ assert 'draggable="true"' in html
+ # node-only export guard stays harmless inline, helpers come before logic_ui's consumers
+ assert html.index("function uscgImageRef(") < html.index("function sendModalToLoadImage(")
diff --git a/web/dashboard.js b/web/dashboard.js
index aa124d5..95313a9 100644
--- a/web/dashboard.js
+++ b/web/dashboard.js
@@ -161,6 +161,61 @@ app.registerExtension({
// Full pass for survivors (preview-pass workflow): flip the matching Config Builder to
// "Preview pass off" and queue the prompt. Feature-detected; the dashboard falls back to an
// instructions toast when this does not answer (or app.queuePrompt is unavailable).
+ // Revise-modal "Send to Load Image" (issue #22): fill the selected / only / a new Load Image node.
+ if (event.data?.type === 'uscg_send_to_load_image') {
+ const reply = (ok, message) => {
+ try { event.source?.postMessage({ type: 'uscg_send_to_load_image_result', ok, message }, '*'); } catch (e) { /* ignore */ }
+ };
+ (async () => {
+ try {
+ const d = event.data;
+ const u = new URL(String(d.url || ''), location.href);
+ if (u.origin !== location.origin || u.pathname !== '/view') {
+ reply(false, "Refused: the image URL is not this ComfyUI server's /view.");
+ return;
+ }
+ const filename = String(d.filename || u.searchParams.get('filename') || '');
+ const subfolder = String(d.subfolder || '');
+ const imgType = String(d.imageType || 'output');
+ if (!filename) { reply(false, 'No filename.'); return; }
+ const all = (app.graph?._nodes || []);
+ const loads = all.filter(n => n.type === 'LoadImage');
+ const sel = Object.values(app.canvas?.selected_nodes || {}).filter(n => n.type === 'LoadImage');
+ let node = sel[0] || (loads.length === 1 ? loads[0] : null);
+ if (!node) {
+ node = LiteGraph.createNode('LoadImage');
+ if (!node) { reply(false, 'Could not create a Load Image node.'); return; }
+ const dash = all.find(n => String(n.id) === String(d.node_id));
+ node.pos = dash ? [dash.pos[0] + dash.size[0] + 40, dash.pos[1]] : [60, 60];
+ app.graph.add(node);
+ }
+ const w = node.widgets?.find(x => x.name === 'image');
+ if (!w) { reply(false, 'The Load Image node has no image widget.'); return; }
+ let value = (subfolder ? subfolder + '/' : '') + filename + ' [' + imgType + ']';
+ if (d.upload) {
+ const blob = await (await fetch(u.href)).blob();
+ const fd = new FormData();
+ fd.append('image', new File([blob], filename, { type: blob.type }));
+ fd.append('type', 'input');
+ const r = await api.fetchApi('/upload/image', { method: 'POST', body: fd });
+ if (!r.ok) { reply(false, 'Upload failed (HTTP ' + r.status + ').'); return; }
+ const j = await r.json();
+ value = j.subfolder ? j.subfolder + '/' + j.name : j.name;
+ }
+ const old = w.value;
+ if (w.options?.values && !w.options.values.includes(value)) w.options.values.push(value);
+ w.value = value;
+ w.callback?.(value);
+ node.onWidgetChanged?.(w.name, value, old, w);
+ app.graph.setDirtyCanvas(true, true);
+ reply(true, `Loaded into "${node.title || 'Load Image'}" (#${node.id})`);
+ } catch (e) {
+ reply(false, 'Could not send the image: ' + (e?.message || e));
+ }
+ })();
+ return;
+ }
+
if (event.data?.type === 'uscg_run_full_pass') {
const reply = (ok, message) => {
try { event.source?.postMessage({ type: 'uscg_run_full_pass_result', ok, message }, '*'); } catch (e) { /* ignore */ }