diff --git a/src/interaction/siRecords.js b/src/interaction/siRecords.js index 10897c4f0cc7b7a5a198fe79841bca8b58c9d737..707849bcb38af95567bbeae0e1a96efb7e849552 100644 --- a/src/interaction/siRecords.js +++ b/src/interaction/siRecords.js @@ -199,30 +199,36 @@ App.UI.SlaveInteract.records = function(slave, refresh) { const ownedSlavesSpan = document.createElement("span"); for (let i = 0; i < ownedSlaves.length; i++) { + const innerSpan = document.createElement("span"); const slave = getSlave(ownedSlaves[i]); + innerSpan.style.display = 'inline-block'; // hack to prevent span breaking line and giving unusable tooltip + innerSpan.style.marginRight = '4px'; + if (ownedSlaves.length > 1) { if (i === ownedSlaves.length - 1) { - ownedSlavesSpan.append(` and `, App.UI.DOM.referenceSlaveWithPreview(slave, SlaveFullName(slave))); + innerSpan.append(` and `, App.UI.DOM.referenceSlaveWithPreview(slave, SlaveFullName(slave))); if (unownedSlaves > 0) { - ownedSlavesSpan.append(`, as well as ${numberWithPlural(unownedSlaves, 'slave')} you don't currently own`); + innerSpan.append(`, as well as ${numberWithPlural(unownedSlaves, 'slave')} you don't currently own`); } - ownedSlavesSpan.append(`.`); + innerSpan.append(`.`); } else { - ownedSlavesSpan.append(App.UI.DOM.referenceSlaveWithPreview(slave, SlaveFullName(slave))); + innerSpan.append(App.UI.DOM.referenceSlaveWithPreview(slave, SlaveFullName(slave))); if (ownedSlaves.length > 2) { - ownedSlavesSpan.append(`, `); + innerSpan.append(`, `); } } } else { - ownedSlavesSpan.append( + innerSpan.append( App.UI.DOM.referenceSlaveWithPreview(slave, SlaveFullName(slave)), `.`, ); } + + ownedSlavesSpan.append(innerSpan); } if (slave.partners.has(-1)) { diff --git a/src/player/managePersonalAffairs.js b/src/player/managePersonalAffairs.js index d21bb58feeecf499b4c907a253dc5ce089de07bb..1dfecc86216931726ca64bf489c9a2f641fc6e71 100644 --- a/src/player/managePersonalAffairs.js +++ b/src/player/managePersonalAffairs.js @@ -678,33 +678,39 @@ App.UI.managePersonalAffairs = function() { const ownedSlavesSpan = document.createElement("span"); for (let i = 0; i < ownedSlaves.length; i++) { + const innerSpan = document.createElement("span"); const slave = getSlave(ownedSlaves[i]); + innerSpan.style.display = 'inline-block'; // hack to prevent span breaking line and giving unusable tooltip + innerSpan.style.marginRight = '4px'; + if (ownedSlaves.length > 1) { if (i === ownedSlaves.length - 1) { - ownedSlavesSpan.append( + innerSpan.append( ` and `, App.UI.DOM.referenceSlaveWithPreview(slave, SlaveFullName(slave)), ); if (unownedSlaves > 0) { - ownedSlavesSpan.append(`, as well as ${numberWithPlural(unownedSlaves, 'slave')} you don't currently own`); + innerSpan.append(`, as well as ${numberWithPlural(unownedSlaves, 'slave')} you don't currently own`); } - ownedSlavesSpan.append(`.`); + innerSpan.append(`.`); } else { - ownedSlavesSpan.append(App.UI.DOM.referenceSlaveWithPreview(slave, SlaveFullName(slave))); + innerSpan.append(App.UI.DOM.referenceSlaveWithPreview(slave, SlaveFullName(slave))); if (ownedSlaves.length > 2) { - ownedSlavesSpan.append(`, `); + innerSpan.append(`, `); } } } else { - ownedSlavesSpan.append( + innerSpan.append( App.UI.DOM.referenceSlaveWithPreview(slave, SlaveFullName(slave)), `.`, ); } + + ownedSlavesSpan.append(innerSpan); } if (PC.partners.has(-2)) {