Merge branch 'staging' into pr/3434

92a83ed01b476e65bf2188b6e7b09c802c63f35f

Wolfsblvt <wolfsblvt@gmail.com>

Parents: d35bd3b073a21d5772a13968ba072d10b4c3b8f3 f85e464ffd9c98616cc8c250e5e264e776026cda
2 files changed, +4 -1Showing whitespace changes
public/index.html+1 -1
@@ -5846,7 +5846,7 @@
5846 <div class="inline-drawer-content flex-container paddingBottom5px wide100p">5846 <div class="inline-drawer-content flex-container paddingBottom5px wide100p">
5847 <div class="flex-container wide100p alignitemscenter">5847 <div class="flex-container wide100p alignitemscenter">
5848 <div name="keywordsAndLogicBlock" class="flex-container wide100p alignitemscenter">5848 <div name="keywordsAndLogicBlock" class="flex-container wide100p alignitemscenter">
5849 <div class="world_entry_form_control flex1">5849 <div class="world_entry_form_control keyprimary flex1">
5850 <small class="displayNone">5850 <small class="displayNone">
5851 <span data-i18n="Comma separated (required)">5851 <span data-i18n="Comma separated (required)">
5852 Comma separated (required)5852 Comma separated (required)
public/scripts/world-info.js+3 -0
@@ -2437,7 +2437,9 @@ export async function getWorldEntry(name, data, entry) {
2437 setWIOriginalDataValue(data, uid, originalDataValueName, data.entries[uid][entryPropName]);2437 setWIOriginalDataValue(data, uid, originalDataValueName, data.entries[uid][entryPropName]);
2438 await saveWorldInfo(name, data);2438 await saveWorldInfo(name, data);
2439 }2439 }
2440 $(this).toggleClass('empty', !data.entries[uid][entryPropName].length);
2440 });2441 });
2442 input.toggleClass('empty', !entry[entryPropName].length);
2441 input.on('select2:select', /** @type {function(*):void} */ event => updateWorldEntryKeyOptionsCache([event.params.data]));2443 input.on('select2:select', /** @type {function(*):void} */ event => updateWorldEntryKeyOptionsCache([event.params.data]));
2442 input.on('select2:unselect', /** @type {function(*):void} */ event => updateWorldEntryKeyOptionsCache([event.params.data], { remove: true }));2444 input.on('select2:unselect', /** @type {function(*):void} */ event => updateWorldEntryKeyOptionsCache([event.params.data], { remove: true }));
24432445
@@ -2472,6 +2474,7 @@ export async function getWorldEntry(name, data, entry) {
2472 data.entries[uid][entryPropName] = splitKeywordsAndRegexes(value);2474 data.entries[uid][entryPropName] = splitKeywordsAndRegexes(value);
2473 setWIOriginalDataValue(data, uid, originalDataValueName, data.entries[uid][entryPropName]);2475 setWIOriginalDataValue(data, uid, originalDataValueName, data.entries[uid][entryPropName]);
2474 await saveWorldInfo(name, data);2476 await saveWorldInfo(name, data);
2477 $(this).toggleClass('empty', !data.entries[uid][entryPropName].length);
2475 }2478 }
2476 });2479 });
2477 input.val(entry[entryPropName].join(', ')).trigger('input', { skipReset: true });2480 input.val(entry[entryPropName].join(', ')).trigger('input', { skipReset: true });