From 5f86b99bc3c78fedae98b2779b2ed45b1b32f504 Mon Sep 17 00:00:00 2001 From: rgthree Date: Fri, 17 May 2024 23:21:42 -0400 Subject: [PATCH] Some cleanup and new menu class. --- src_web/comfyui/dialog_info.ts | 76 ++++++++++--- src_web/comfyui/rgthree.scss | 1 + src_web/comfyui/rgthree.ts | 3 + src_web/comfyui/utils_menu.ts | 5 +- src_web/common/css/dialog_model_info.scss | 52 ++++++--- src_web/common/css/menu.scss | 43 +++++++ src_web/common/menu.ts | 130 ++++++++++++++++++++++ src_web/common/model_info_service.ts | 8 +- src_web/common/rgthree_api.ts | 21 ++-- web/comfyui/dialog_info.js | 74 ++++++++---- web/comfyui/rgthree.css | 38 +++++++ web/comfyui/rgthree.js | 3 + web/comfyui/utils_menu.js | 6 +- web/common/css/dialog_model_info.css | 53 ++++----- web/common/css/menu.css | 37 ++++++ web/common/menu.js | 98 ++++++++++++++++ web/common/model_info_service.js | 7 +- web/common/rgthree_api.js | 14 ++- 18 files changed, 572 insertions(+), 97 deletions(-) create mode 100644 src_web/common/css/menu.scss create mode 100644 src_web/common/menu.ts create mode 100644 web/common/css/menu.css create mode 100644 web/common/menu.js diff --git a/src_web/comfyui/dialog_info.ts b/src_web/comfyui/dialog_info.ts index 0762b5b..f996cea 100644 --- a/src_web/comfyui/dialog_info.ts +++ b/src_web/comfyui/dialog_info.ts @@ -6,12 +6,15 @@ import { getClosestOrSelf, queryOne, query, + setAttributes, } from "rgthree/common/utils_dom.js"; -import { logoCivitai, link, pencilColored, diskColored } from "rgthree/common/media/svgs.js"; +import { logoCivitai, link, pencilColored, diskColored, dotdotdot } from "rgthree/common/media/svgs.js"; import { RgthreeModelInfo } from "typings/rgthree.js"; import { SERVICE as MODEL_INFO_SERVICE } from "rgthree/common/model_info_service.js"; import { rgthree } from "./rgthree.js"; +import { MenuButton } from "rgthree/common/menu.js"; import { generateId } from "rgthree/common/shared_utils.js"; +import { rgthreeApi } from "rgthree/common/rgthree_api.js"; function injectCss(): Promise { const href = "rgthree/common/css/dialog_model_info.css"; @@ -152,20 +155,20 @@ export class RgthreeInfoDialog extends RgthreeDialog { const info = this.modelInfo || {}; const civitaiLink = info.links?.find((i) => i.includes("civitai.com/models")); const html = ` -