Skip to content

Commit 9772e66

Browse files
committed
ページ切り替え時の画像生成処理をシンプル化
- generateTaskIdを削除しcanvasGuidをキーに変更 - トースト通知とCSS演出を削除 - 重複関数を整理 https://claude.ai/code/session_01CNYq111yXiHKxE7QtVFd1f
1 parent 355b999 commit 9772e66

File tree

4 files changed

+83
-267
lines changed

4 files changed

+83
-267
lines changed

css/ui/bottom-bar.css

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -194,20 +194,3 @@ color:#00ffff;
194194
z-index: 1;
195195
}
196196

197-
@keyframes btm-pulse-glow {
198-
0% {
199-
box-shadow: 0 0 5px #00ffff, 0 0 10px #00ffff;
200-
}
201-
50% {
202-
box-shadow: 0 0 15px #00ffff, 0 0 25px #00ffff, 0 0 35px #00ffff;
203-
}
204-
100% {
205-
box-shadow: 0 0 5px #00ffff, 0 0 10px #00ffff;
206-
}
207-
}
208-
209-
.btm-generation-complete {
210-
animation: btm-pulse-glow 0.5s ease-in-out 3;
211-
border: 2px solid #00ffff;
212-
border-radius: 4px;
213-
}

js/ai/comfyui/comfyui-management.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ requestData["uploadFileName"]=uploadFilename;
158158

159159
var workflow=comfyuiReplacePlaceholders(selectedWorkflow,requestData,Type);
160160

161-
var taskId=generateTaskId();
161+
var canvasGuid=getCanvasGUID();
162162
var layerType='unknown';
163163
var targetLayerGuid=null;
164164
if(isPanel(layer)){
@@ -171,7 +171,7 @@ targetLayerGuid=layer.relatedPoly?getGUID(layer.relatedPoly):getGUID(layer);
171171
layerType='standalone';
172172
}
173173
var center=calculateCenter(layer);
174-
await registerGenerationTask(taskId,{
174+
await registerGenerationTask(canvasGuid,{
175175
layerGuid:getGUID(layer),
176176
layerType:layerType,
177177
centerX:center.centerX,
@@ -194,13 +194,13 @@ if (result&&result.error) {
194194
createToastError("Generation Error",result.message);
195195
throw new Error(result.message);
196196
} else if (result) {
197-
if(isPageChanged(taskId)){
198-
var applied=await applyGeneratedImageToOriginalPage(taskId,result);
197+
if(isPageChanged(canvasGuid)){
198+
var applied=await applyGeneratedImageToOriginalPage(canvasGuid,result);
199199
if(applied){
200200
return;
201201
}
202202
}
203-
removeGenerationTask(taskId);
203+
removeGenerationTask(canvasGuid);
204204
if(isPanel(layer)){
205205
var center=calculateCenter(layer);
206206
putImageInFrame(result,center.centerX,center.centerY,false,false,true,layer);
@@ -220,7 +220,7 @@ throw new Error("Unexpected error: No result returned from comfyui_put_queue_v2"
220220
}
221221
})
222222
.catch((error)=>{
223-
removeGenerationTask(taskId);
223+
removeGenerationTask(canvasGuid);
224224
let help=getText("comfyUI_workflowErrorHelp");
225225
createToastError("Generation Error",[error.message,help],8000);
226226
comfyuiLogger.error("Error:",error);

0 commit comments

Comments
 (0)