#2012 Replace all comfy seeds

public/index.html

@@ -4838,7 +4838,7 @@
                             <div class="flex-container alignitemscenter wide100p">
                                 <div class="WIEntryTitleAndStatus flex-container flex1 alignitemscenter">
                                     <div class="flex-container flex1">
-                                        <textarea class="text_pole autoSetHeight" name="comment" maxlength="5000" data-i18n="[placeholder]Entry Title/Memo" placeholder="Entry Title/Memo"></textarea>
+                                        <textarea class="text_pole" rows="1" name="comment" maxlength="5000" data-i18n="[placeholder]Entry Title/Memo" placeholder="Entry Title/Memo"></textarea>
                                     </div>
                                     <!-- <span class="world_entry_form_position_value"></span> -->
                                     <select data-i18n="[title]WI Entry Status:🔵 Constant🟢 Normal❌ Disabled" title="WI Entry Status:&#13;🔵 Constant&#13;🟢 Normal&#13;❌ Disabled" name="entryStateSelector" class="text_pole widthNatural margin0">

public/scripts/extensions/quick-reply/html/qrEditor.html

@@ -78,7 +78,7 @@
                 <input type="checkbox" id="qr--executeOnGroupMemberDraft">
                 <span><i class="fa-solid fa-fw fa-people-group"></i> Execute before group member message</span>
             </label>
-            <div class="flex-container alignItemsBaseline" title="Activate this quick reply when a World Info entry with the same Automation ID is triggered.">
+            <div class="flex-container alignItemsBaseline flexFlowColumn flexNoGap" title="Activate this quick reply when a World Info entry with the same Automation ID is triggered.">
                 <small>Automation ID</small>
                 <input type="text" id="qr--automationId" class="text_pole flex1" placeholder="( None )">
             </div>

public/scripts/extensions/quick-reply/index.js

@@ -104,7 +104,7 @@ const loadSets = async () => {
                     qr.executeOnAi = slot.autoExecute_botMessage ?? false;
                     qr.executeOnChatChange = slot.autoExecute_chatLoad ?? false;
                     qr.executeOnGroupMemberDraft = slot.autoExecute_groupMemberDraft ?? false;
-                    qr.automationId = slot.automationId ?? false;
+                    qr.automationId = slot.automationId ?? '';
                     qr.contextList = (slot.contextMenu ?? []).map(it=>({
                         set: it.preset,
                         isChained: it.chain,

public/scripts/extensions/stable-diffusion/index.js

@@ -2524,7 +2524,7 @@ async function generateComfyImage(prompt, negativePrompt) {
     }
     let workflow = (await workflowResponse.json()).replace('"%prompt%"', JSON.stringify(prompt));
     workflow = workflow.replace('"%negative_prompt%"', JSON.stringify(negativePrompt));
-    workflow = workflow.replace('"%seed%"', JSON.stringify(Math.round(Math.random() * Number.MAX_SAFE_INTEGER)));
+    workflow = workflow.replaceAll('"%seed%"', JSON.stringify(Math.round(Math.random() * Number.MAX_SAFE_INTEGER)));
     placeholders.forEach(ph => {
         workflow = workflow.replace(`"%${ph}%"`, JSON.stringify(extension_settings.sd[ph]));
     });

public/scripts/tags.js

@@ -43,6 +43,9 @@ export {
 
 const CHARACTER_FILTER_SELECTOR = '#rm_characters_block .rm_tag_filter';
 const GROUP_FILTER_SELECTOR = '#rm_group_chats_block .rm_tag_filter';
+const TAG_TEMPLATE = $('#tag_template .tag');
+const FOLDER_TEMPLATE = $('#bogus_folder_template .bogus_folder_select');
+const VIEW_TAG_TEMPLATE = $('#tag_view_template .tag_view_item');
 
 function getFilterHelper(listSelector) {
     return $(listSelector).is(GROUP_FILTER_SELECTOR) ? groupCandidatesFilter : entitiesFilter;
@@ -271,7 +274,7 @@ function getTagBlock(tag, entities, hidden = 0) {
 
     const tagFolder = TAG_FOLDER_TYPES[tag.folder_type];
 
-    const template = $('#bogus_folder_template .bogus_folder_select').clone();
+    const template = FOLDER_TEMPLATE.clone();
     template.addClass(tagFolder.class);
     template.attr({ 'tagid': tag.id, 'id': `BogusFolder${tag.id}` });
     template.find('.avatar').css({ 'background-color': tag.color, 'color': tag.color2 }).attr('title', `[Folder] ${tag.name}`);
@@ -665,7 +668,7 @@ function appendTagToList(listElement, tag, { removable = false, selectable = fal
         return;
     }
 
-    let tagElement = $('#tag_template .tag').clone();
+    let tagElement = TAG_TEMPLATE.clone();
     tagElement.attr('id', tag.id);
 
     //tagElement.css('color', 'var(--SmartThemeBodyColor)');
@@ -1131,7 +1134,7 @@ function onTagCreateClick() {
 
 function appendViewTagToList(list, tag, everything) {
     const count = everything.filter(x => x == tag.id).length;
-    const template = $('#tag_view_template .tag_view_item').clone();
+    const template = VIEW_TAG_TEMPLATE.clone();
     template.attr('id', tag.id);
     template.find('.tag_view_counter_value').text(count);
     template.find('.tag_view_name').text(tag.name);
@@ -1148,16 +1151,18 @@ function appendViewTagToList(list, tag, everything) {
         template.find('.tag_as_folder').hide();
     }
 
-    template.find('.tagColorPickerHolder').html(
-        `<toolcool-color-picker id="${colorPickerId}" color="${tag.color}" class="tag-color"></toolcool-color-picker>`,
-    );
-    template.find('.tagColorPicker2Holder').html(
-        `<toolcool-color-picker id="${colorPicker2Id}" color="${tag.color2}" class="tag-color2"></toolcool-color-picker>`,
-    );
+    const primaryColorPicker = $('<toolcool-color-picker></toolcool-color-picker>')
+        .addClass('tag-color')
+        .attr({ id: colorPickerId, color: tag.color });
+
+    const secondaryColorPicker = $('<toolcool-color-picker></toolcool-color-picker>')
+        .addClass('tag-color2')
+        .attr({ id: colorPicker2Id, color: tag.color2 });
+
+    template.find('.tagColorPickerHolder').append(primaryColorPicker);
+    template.find('.tagColorPicker2Holder').append(secondaryColorPicker);
 
     template.find('.tag_as_folder').attr('id', tagAsFolderId);
-    template.find('.tag-color').attr('id', colorPickerId);
-    template.find('.tag-color2').attr('id', colorPicker2Id);
 
     list.append(template);
 

public/scripts/world-info.js

@@ -42,6 +42,8 @@ const world_info_logic = {
     AND_ALL: 3,
 };
 
+const WI_ENTRY_EDIT_TEMPLATE = $('#entry_edit_template .world_entry');
+
 let world_info = {};
 let selected_world_info = [];
 let world_names;
@@ -799,6 +801,11 @@ function displayWorldEntries(name, data, navigation = navigation_option.none) {
         afterSizeSelectorChange: function (e) {
             localStorage.setItem(storageKey, e.target.value);
         },
+        afterPaging: function () {
+            $('#world_popup_entries_list textarea[name="comment"]').each(function () {
+                initScrollHeight($(this));
+            });
+        },
     });
 
     if (typeof navigation === 'number' && Number(navigation) >= 0) {
@@ -986,7 +993,7 @@ function getWorldEntry(name, data, entry) {
         return;
     }
 
-    const template = $('#entry_edit_template .world_entry').clone();
+    const template = WI_ENTRY_EDIT_TEMPLATE.clone();
     template.data('uid', entry.uid);
     template.attr('uid', entry.uid);
 
@@ -998,10 +1005,10 @@ function getWorldEntry(name, data, entry) {
         event.stopPropagation();
     });
 
-    keyInput.on('input', function () {
+    keyInput.on('input', function (_, { skipReset } = {}) {
         const uid = $(this).data('uid');
         const value = String($(this).val());
-        resetScrollHeight(this);
+        !skipReset && resetScrollHeight(this);
         data.entries[uid].key = value
             .split(',')
             .map((x) => x.trim())
@@ -1010,7 +1017,7 @@ function getWorldEntry(name, data, entry) {
         setOriginalDataValue(data, uid, 'keys', data.entries[uid].key);
         saveWorldInfo(name, data);
     });
-    keyInput.val(entry.key.join(', ')).trigger('input');
+    keyInput.val(entry.key.join(', ')).trigger('input', { skipReset: true });
     //initScrollHeight(keyInput);
 
     // logic AND/NOT
@@ -1024,7 +1031,6 @@ function getWorldEntry(name, data, entry) {
     selectiveLogicDropdown.on('input', function () {
         const uid = $(this).data('uid');
         const value = Number($(this).val());
-        console.debug(`logic for ${entry.uid} set to ${value}`);
         data.entries[uid].selectiveLogic = !isNaN(value) ? value : world_info_logic.AND_ANY;
         setOriginalDataValue(data, uid, 'selectiveLogic', data.entries[uid].selectiveLogic);
         saveWorldInfo(name, data);
@@ -1134,10 +1140,10 @@ function getWorldEntry(name, data, entry) {
     // keysecondary
     const keySecondaryInput = template.find('textarea[name="keysecondary"]');
     keySecondaryInput.data('uid', entry.uid);
-    keySecondaryInput.on('input', function () {
+    keySecondaryInput.on('input', function (_, { skipReset } = {}) {
         const uid = $(this).data('uid');
         const value = String($(this).val());
-        resetScrollHeight(this);
+        !skipReset && resetScrollHeight(this);
         data.entries[uid].keysecondary = value
             .split(',')
             .map((x) => x.trim())
@@ -1147,17 +1153,17 @@ function getWorldEntry(name, data, entry) {
         saveWorldInfo(name, data);
     });
 
-    keySecondaryInput.val(entry.keysecondary.join(', ')).trigger('input');
-    initScrollHeight(keySecondaryInput);
+    keySecondaryInput.val(entry.keysecondary.join(', ')).trigger('input', { skipReset: true });
+    //initScrollHeight(keySecondaryInput);
 
     // comment
     const commentInput = template.find('textarea[name="comment"]');
     const commentToggle = template.find('input[name="addMemo"]');
     commentInput.data('uid', entry.uid);
-    commentInput.on('input', function () {
+    commentInput.on('input', function (_, { skipReset } = {}) {
         const uid = $(this).data('uid');
         const value = $(this).val();
-        resetScrollHeight(this);
+        !skipReset && resetScrollHeight(this);
         data.entries[uid].comment = value;
 
         setOriginalDataValue(data, uid, 'comment', data.entries[uid].comment);
@@ -1176,8 +1182,8 @@ function getWorldEntry(name, data, entry) {
         value ? commentContainer.show() : commentContainer.hide();
     });
 
-    commentInput.val(entry.comment).trigger('input');
-    initScrollHeight(commentInput);
+    commentInput.val(entry.comment).trigger('input', { skipReset: true });
+    //initScrollHeight(commentInput);
     commentToggle.prop('checked', true /* entry.addMemo */).trigger('input');
     commentToggle.parent().hide();
 
@@ -1212,6 +1218,8 @@ function getWorldEntry(name, data, entry) {
         if (counter.data('first-run')) {
             counter.data('first-run', false);
             countTokensDebounced(counter, contentInput.val());
+            initScrollHeight(keyInput);
+            initScrollHeight(keySecondaryInput);
         }
     });
 
@@ -1378,7 +1386,7 @@ function getWorldEntry(name, data, entry) {
     }
 
     const positionInput = template.find('select[name="position"]');
-    initScrollHeight(positionInput);
+    //initScrollHeight(positionInput);
     positionInput.data('uid', entry.uid);
     positionInput.on('click', function (event) {
         // Prevent closing the drawer on clicking the input
@@ -1435,7 +1443,6 @@ function getWorldEntry(name, data, entry) {
     //new tri-state selector for constant/normal/disabled
     const entryStateSelector = template.find('select[name="entryStateSelector"]');
     entryStateSelector.data('uid', entry.uid);
-    console.log(entry.uid);
     entryStateSelector.on('click', function (event) {
         // Prevent closing the drawer on clicking the input
         event.stopPropagation();
@@ -1450,7 +1457,6 @@ function getWorldEntry(name, data, entry) {
                 setOriginalDataValue(data, uid, 'enabled', true);
                 setOriginalDataValue(data, uid, 'constant', true);
                 template.removeClass('disabledWIEntry');
-                console.debug('set to constant');
                 break;
             case 'normal':
                 data.entries[uid].constant = false;
@@ -1458,7 +1464,6 @@ function getWorldEntry(name, data, entry) {
                 setOriginalDataValue(data, uid, 'enabled', true);
                 setOriginalDataValue(data, uid, 'constant', false);
                 template.removeClass('disabledWIEntry');
-                console.debug('set to normal');
                 break;
             case 'disabled':
                 data.entries[uid].constant = false;
@@ -1466,7 +1471,6 @@ function getWorldEntry(name, data, entry) {
                 setOriginalDataValue(data, uid, 'enabled', false);
                 setOriginalDataValue(data, uid, 'constant', false);
                 template.addClass('disabledWIEntry');
-                console.debug('set to disabled');
                 break;
         }
         saveWorldInfo(name, data);
@@ -1474,19 +1478,13 @@ function getWorldEntry(name, data, entry) {
     });
 
     const entryState = function () {
-
-        console.log(`constant: ${entry.constant},  disabled: ${entry.disable}`);
         if (entry.constant === true) {
-            console.debug('found constant');
             return 'constant';
         } else if (entry.disable === true) {
-            console.debug('found disabled');
             return 'disabled';
         } else {
-            console.debug('found normal');
             return 'normal';
         }
-
     };
     template
         .find(`select[name="entryStateSelector"] option[value=${entryState()}]`)
@@ -1982,15 +1980,12 @@ async function getSortedEntries() {
 
         switch (Number(world_info_character_strategy)) {
             case world_info_insertion_strategy.evenly:
-                console.debug('WI using evenly');
                 entries = [...globalLore, ...characterLore].sort(sortFn);
                 break;
             case world_info_insertion_strategy.character_first:
-                console.debug('WI using char first');
                 entries = [...characterLore.sort(sortFn), ...globalLore.sort(sortFn)];
                 break;
             case world_info_insertion_strategy.global_first:
-                console.debug('WI using global first');
                 entries = [...globalLore.sort(sortFn), ...characterLore.sort(sortFn)];
                 break;
             default: