From 73dfb25a108e6baa9222fb348ccc69f57691a102 Mon Sep 17 00:00:00 2001
From: DCoded <dcoded@live.com>
Date: Thu, 25 Apr 2019 01:14:56 -0400
Subject: [PATCH] Bugfix, template literatified optionMacro.js
---
src/js/DefaultRules.js | 2 +-
src/js/optionsMacro.js | 13 ++++++-------
src/js/slaveSummaryWidgets.js | 2 +-
3 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/src/js/DefaultRules.js b/src/js/DefaultRules.js
index 8e93ad60186..a3665caa478 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 6f87dc1935c..54c9e134d33 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 91f50ce22f9..7a351d8a356 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) {
--
GitLab