Fix A/N and CFG menus on first in the list

14aec430644bee10b5a2de71d663051c7f3c7a24

Cohee <18619528+Cohee1207@users.noreply.github.com>

public/scripts/authors-note.js+7 -7 Viewed

+}
 function onANMenuItemClick() {
-    if (selected_group || this_chid) {
+    if (!selected_group && this_chid === undefined) {
+        toastr.warning(t`Select a character before trying to use Author's Note`, '', { timeOut: 2000 });
+        return;
+    }
     //show AN if it's hidden
     if ($('#floatingPrompt').css('display') !== 'flex') {
         $('#floatingPrompt').addClass('resizing');

         $('#floatingPrompt').transition({
             opacity: 0.0,
             duration: animation_duration,
-            },
+        }, async function () {
-            async function () {
             await delay(50);
             $('#floatingPrompt').removeClass('resizing');
         });
         setTimeout(function () {
             $('#floatingPrompt').hide();
         }, animation_duration);
+    }
     //duplicate options menu close handler from script.js
     //because this listener takes priority
     $('#options').stop().fadeOut(animation_duration);
-    } else {
-        toastr.warning(t`Select a character before trying to use Author's Note`, '', { timeOut: 2000 });
-    }
+}
 async function onChatChanged() {

public/scripts/cfg-scale.js+7 -8 Viewed

         if (!existingCharaCfg.useChara &&
             (tempAssign.guidance_scale ?? 1.00) === 1.00 &&
             (tempAssign.negative_prompt?.length ?? 0) === 0 &&
-            (tempAssign.positive_prompt?.length ?? 0) === 0)
+            (tempAssign.positive_prompt?.length ?? 0) === 0) {
-        {
             extension_settings.cfg.chara.splice(existingCharaCfgIndex, 1);
+        }
     } else if (avatarName && tempValue.length > 0) {

 // TODO: Only change CFG when character is selected
 function onCfgMenuItemClick() {
-    if (selected_group || this_chid) {
+    if (!selected_group && this_chid === undefined) {
+        toastr.warning('Select a character before trying to configure CFG', '', { timeOut: 2000 });
+        return;
+    }
     //show CFG config if it's hidden
     if ($('#cfgConfig').css('display') !== 'flex') {
         $('#cfgConfig').addClass('resizing');

         $('#cfgConfig').transition({
             opacity: 0.0,
             duration: animation_duration,
-            },
+        }, async function () {
-            async function () {
             await delay(50);
             $('#cfgConfig').removeClass('resizing');
         });

     //duplicate options menu close handler from script.js
     //because this listener takes priority
     $('#options').stop().fadeOut(animation_duration);
-    } else {
-        toastr.warning('Select a character before trying to configure CFG', '', { timeOut: 2000 });
-    }
+}
 async function onChatChanged() {