Item box: Use startsWith, not includes, for field name checks

This commit is contained in:
Abe Jellinek 2024-07-09 10:32:33 -04:00 committed by Dan Stillman
parent c05d43fa8e
commit a334d9fdd8

View file

@ -2103,7 +2103,7 @@
} }
// The creator row is dropped before a non-creator row, meaning it's moved below // The creator row is dropped before a non-creator row, meaning it's moved below
// all other creators // all other creators
else if (!beforeCreatorField.includes("creator-")) { else if (!beforeCreatorField.startsWith("creator-")) {
beforeCreatorIndex = this.item.numCreators(); beforeCreatorIndex = this.item.numCreators();
} }
// Creator row is placed before another creator // Creator row is placed before another creator
@ -2261,7 +2261,7 @@
let refocusField = this.querySelector(`#${CSS.escape(this._selectField)}:not([disabled="true"])`); let refocusField = this.querySelector(`#${CSS.escape(this._selectField)}:not([disabled="true"])`);
// For creator rows, if a focusable node with desired id does not exist, try to focus // For creator rows, if a focusable node with desired id does not exist, try to focus
// the same component from the last available creator row // the same component from the last available creator row
if (!refocusField && this._selectField.includes("creator")) { if (!refocusField && this._selectField.startsWith("creator-")) {
let maybeLastCreatorID = this._selectField.replace(/\d+/g, Math.max(this._creatorCount - 1, 0)); let maybeLastCreatorID = this._selectField.replace(/\d+/g, Math.max(this._creatorCount - 1, 0));
refocusField = this.querySelector(`#${CSS.escape(maybeLastCreatorID)}`); refocusField = this.querySelector(`#${CSS.escape(maybeLastCreatorID)}`);
} }