diff --git a/src/js/DefaultRules.js b/src/js/DefaultRules.js index 8e93ad60186dcff224abb52ceb25d8b9e8f3efa9..a3665caa4785b9eacea50504fce4ac6b5e0ee8dd 100644 --- a/src/js/DefaultRules.js +++ b/src/js/DefaultRules.js @@ -2903,7 +2903,7 @@ window.DefaultRules = (function() { } slave.trust -= 5; slave.health -= 10; - r += `<br>${slave.slaveName} has been branded, with <span class=gold>fear</span>${slave.devotion < 18? ", <span class=mediumorchid>regard,</span>":""} and <span class=red>health</span> consequences.`; + r += `<br>${slave.slaveName} has been branded, with <span class=gold>fear</span>${slave.devotion < 18 ? `, <span class=mediumorchid>regard,</span>` : ``} and <span class=red>health</span> consequences.`; } } } diff --git a/src/js/optionsMacro.js b/src/js/optionsMacro.js index 6f87dc1935c1d132d8c72571cec392b73b709b86..54c9e134d33fd9db6611a8288e94e747c496e376 100644 --- a/src/js/optionsMacro.js +++ b/src/js/optionsMacro.js @@ -157,9 +157,9 @@ Macro.add('options', { if (found_index !== i || hasMultipleOptionsWithSameValue) { let onClickChange = args[hasComparitor ? 3 : 2]; onClickChange = onClickChange ? ', ' + onClickChange : ''; - output += `<span class=${className}>[[` + argText + extraComment + '|' + passageName + "][" + variable + " = " + JSON.stringify(args[hasComparitor ? 1 : 0]) + onClickChange + "]]" + "</span>"; + output += `<span class=${className}>[[${argText}${extraComment}|${passageName}][${variable}=${JSON.stringify(args[hasComparitor ? 1 : 0])}${onClickChange}]]</span>`; } else if (showSelectedOption) { - output += `<span class=${optionMacroSelected} ${className}>' ${argText} ${extraComment} </span>`; + output += `<span class=${optionMacroSelected}${className}>${argText}${extraComment}</span>`; } } } else if (this.payload[i].name === 'comment') { @@ -167,11 +167,10 @@ Macro.add('options', { } } jQuery(this.output).wiki( - '<span class=optionMacro' + (currentOptionIsNumber ? 'optionMacroNumber' : '') + '">' + - '<span class=optionDescription>' + title + ' ' + description + "</span>" + - '<span class=optionValue>' + output + "</span>" + - (comment ? '<span class=optionComment>//' + comment + "//</span>" : '') + - '</span>'); + `<span class=optionMacro ${currentOptionIsNumber ? 'optionMacroNumber' : ``}>` + + `<span class=optionDescription> ${title} ${description} </span>` + + `<span class=optionValue> ${output} </span> ${comment ? `<span class=optionComment>// ${comment} //</span>` : ``}` + + `</span>`); } catch (ex) { return this.error('bad options expression: ' + ex.message); } diff --git a/src/js/slaveSummaryWidgets.js b/src/js/slaveSummaryWidgets.js index 91f50ce22f9a63373ba6cf8d5608000cf95f8a54..7a351d8a3561022b5935767ac27358083bd0d883 100644 --- a/src/js/slaveSummaryWidgets.js +++ b/src/js/slaveSummaryWidgets.js @@ -190,7 +190,7 @@ window.SlaveSummaryUncached = (function() { } else { r += `pink`; } - r += `"> `; + r += `> `; if (slave.hormoneBalance < -400) { r += `Overwhelmingly masculine`; } else if (slave.hormoneBalance <= -300) {